Tiny clean-ups.

[lyx.git] / src / frontends / xforms / Color.h

diff --git a/src/frontends/xforms/Color.h b/src/frontends/xforms/Color.h
index b3dbf2a0fed8359b6ac8e6910ab7d19c40a051d5..79458b33bb7d1d70509e9968f2317cdd6a6d7b9a 100644 (file)
--- a/src/frontends/xforms/Color.h
+++ b/src/frontends/xforms/Color.h
@@ -1,13 +1,12 @@
 // -*- C++ -*-
 /**
  * \file Color.h
- * Copyright 1995 Matthias Ettrich
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 /* structs RGBColor and HSVColor to enable simple conversion between
@@ -17,17 +16,21 @@
 #ifndef COLOR_H
 #define COLOR_H
 
+#include <string>
+
+
+class LColor_color;
 
-#include "LString.h"
-#include "LColor.h"
 
 /** Given col, fills r, g, b in the range 0-255.
     The function returns true if successful.
     It returns false on failure and sets r, g, b to 0. */
-bool getRGBColor(LColor::color col,
+bool getRGBColor(LColor_color col,
                 unsigned int & r, unsigned int & g, unsigned int & b);
 
 struct RGBColor;
+/// returns a string of form #rrggbb, given an RGBColor struct
+std::string const X11hexname(RGBColor const & col);
 
 struct HSVColor {
        double h;
@@ -47,15 +50,17 @@ struct RGBColor {
        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 {
-       string name;
+       std::string name;
        NamedColor() : RGBColor() {}
-       NamedColor(string const & n, RGBColor const & c)
+       NamedColor(std::string const & n, RGBColor const & c)
                : RGBColor(c), name(n) {}
        RGBColor const & color() const { return *this; }
-       string const & getname() const { return name; }
+       std::string const & getname() const { return name; }
 };
 
 inline