Fixed some lines that were too long. It compiled afterwards.

[lyx.git] / src / Color.h

diff --git a/src/Color.h b/src/Color.h
index b2a43b7784f7f34e7f42261625d1dcde1d0e22f6..d9be348ac8fa53591463e4739bd529a0b61b9bde 100644 (file)
--- a/src/Color.h
+++ b/src/Color.h
@@ -123,8 +123,10 @@ public:
                mathbg,
                /// Macro math inset background color
                mathmacrobg,
-               /// Math inset frame color
+               /// Math inset frame color under focus
                mathframe,
+               /// Math inset frame color not under focus
+               mathcorners,
                /// Math line color
                mathline,
 
@@ -151,10 +153,10 @@ public:
                appendix,
                /// changebar color
                changebar,
-               /// strike-out color
-               strikeout,
+               /// deleted text color
+               deletedtext,
                /// added text color
-               newtext,
+               addedtext,
                /// Top and bottom line color
                topline,
                /// Table line color
@@ -251,20 +253,6 @@ extern Color lcolor;
 extern Color system_lcolor;
 
 
-struct RGBColor;
-/// returns a string of form #rrggbb, given an RGBColor struct
-std::string const X11hexname(RGBColor const & col);
-
-struct HSVColor {
-       double h;
-       double s;
-       double v;
-       HSVColor() : h(0.0), s(0.0), v(0.0) {}
-       HSVColor(double hue, double sat, double val)
-               : h(hue), s(sat), v(val) {}
-       HSVColor(RGBColor const &);
-};
-
 struct RGBColor {
        unsigned int r;
        unsigned int g;
@@ -272,21 +260,10 @@ struct RGBColor {
        RGBColor() : r(0), g(0), b(0) {}
        RGBColor(unsigned int red, unsigned int green, unsigned int blue)
                : r(red), g(green), b(blue) {}
-       RGBColor(HSVColor const &);
        /// \param x11hexname is of the form "#ffa071"
        RGBColor(std::string const & x11hexname);
 };
 
-struct NamedColor : public RGBColor {
-       std::string lyxname;
-       std::string guiname;
-       NamedColor() : RGBColor() {}
-       NamedColor(std::string const & lyx, std::string const & gui,
-                  RGBColor const & c)
-               : RGBColor(c), lyxname(lyx), guiname(gui) {}
-       RGBColor const & color() const { return *this; }
-};
-
 inline
 bool operator==(RGBColor const & c1, RGBColor const & c2)
 {
@@ -300,6 +277,9 @@ bool operator!=(RGBColor const & c1, RGBColor const & c2)
        return !(c1 == c2);
 }
 
+/// returns a string of form #rrggbb, given an RGBColor struct
+std::string const X11hexname(RGBColor const & col);
+
 } // namespace lyx
 
 #endif