mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-26 03:11:59 +00:00
remove unsued classes HSVColor and NamedColor
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19449 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
f12f6f8043
commit
b202985f2d
28
src/Color.h
28
src/Color.h
@ -253,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;
|
||||
@ -274,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)
|
||||
{
|
||||
@ -302,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
|
||||
|
Loading…
Reference in New Issue
Block a user