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

diff --git a/src/widgets/colorbox.h b/src/widgets/colorbox.h
index cbd9412..7ca6737 100644
--- a/src/widgets/colorbox.h
+++ b/src/widgets/colorbox.h
@@ -2,7 +2,7 @@
 #define __COLORBOX_H__
 
 #include <QtGui>
-#include "rs_color.h"
+#include "color.h"
 
 /**
  * A combobox for choosing a color.
@@ -17,9 +17,9 @@ class ColorBox: public QComboBox
 			QWidget * parent = 0, const char * name = 0);
 		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 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;