X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fwidgets%2Fcolorbox.h;h=7ca67373f64103aa4676e1d55bbf050c1c1c53da;hb=2ee84c5948ede7fc2f7b4435c5edef42a030ac05;hp=a5e58b7fc19373aa1944b694fbaebaf38a2741a4;hpb=e5a77a32dbe17d9534d3099f1fd3fdacba199516;p=architektonas

diff --git a/src/widgets/colorbox.h b/src/widgets/colorbox.h
index a5e58b7..7ca6737 100644
--- a/src/widgets/colorbox.h
+++ b/src/widgets/colorbox.h
@@ -2,24 +2,24 @@
 #define __COLORBOX_H__
 
 #include <QtGui>
-#include "rs_color.h"
+#include "color.h"
 
 /**
  * A combobox for choosing a color.
  */
-class QG_ColorBox: public QComboBox
+class ColorBox: public QComboBox
 {
 	Q_OBJECT
 
 	public:
-		QG_ColorBox(QWidget * parent = 0, const char * name = 0);
-		QG_ColorBox(bool showByLayer, bool showUnchanged,
+		ColorBox(QWidget * parent = 0, const char * name = 0);
+		ColorBox(bool showByLayer, bool showUnchanged,
 			QWidget * parent = 0, const char * name = 0);
-		virtual ~QG_ColorBox();
+		virtual ~ColorBox();
 
-		RS_Color getColor();
-		void setColor(const RS_Color & color);
-		void setLayerColor(const RS_Color & color);
+		Color getColor();
+		void setColor(const Color & color);
+		void setLayerColor(const Color & color);
 		void init(bool showByLayer, bool showUnchanged);
 		bool isUnchanged();
 
@@ -27,10 +27,10 @@ class QG_ColorBox: public QComboBox
 		void slotColorChanged(int index);
 
 	signals:
-		void colorChanged(const RS_Color & color);
+		void colorChanged(const Color & color);
 
 	private:
-		RS_Color currentColor;
+		Color currentColor;
 		bool showByLayer;
 		bool showUnchanged;
 		bool unchanged;