X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Fcolor.h;h=9a5f7b36258793ae1b676f14225d1db756a911f5;hb=2ee84c5948ede7fc2f7b4435c5edef42a030ac05;hp=d07f48da2df5ed7947ae2c99a7e7bc5047853241;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas diff --git a/src/base/color.h b/src/base/color.h index d07f48d..9a5f7b3 100644 --- a/src/base/color.h +++ b/src/base/color.h @@ -14,22 +14,22 @@ * * @author Andrew Mustun */ -class RS_Color: public QColor, public RS_Flags +class Color: public QColor, public Flags { public: - RS_Color(); - RS_Color(int r, int g, int b); - RS_Color(const QColor & c); - RS_Color(const RS_Color & c); - RS_Color(unsigned int f); + Color(); + Color(int r, int g, int b); + Color(const QColor & c); + Color(const Color & c); + Color(unsigned int f); - RS_Color stripFlags() const; + Color stripFlags() const; bool isByLayer() const; bool isByBlock() const; - RS_Color & operator=(const RS_Color & c); - bool operator==(const RS_Color & c) const; + Color & operator=(const Color & c); + bool operator==(const Color & c) const; //no,can't bool operator==(const QColor & c) const; - friend std::ostream & operator<<(std::ostream & os, const RS_Color & c); + friend std::ostream & operator<<(std::ostream & os, const Color & c); }; #endif