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

diff --git a/src/widgets/pentoolbar.h b/src/widgets/pentoolbar.h
index c08f006..9922bd3 100644
--- a/src/widgets/pentoolbar.h
+++ b/src/widgets/pentoolbar.h
@@ -2,18 +2,18 @@
 #define __PENTOOLBAR_H__
 
 #include <QtGui>
-//#include "rs_layerlistlistener.h"
-#include "rs_pen.h"
+//#include "layerlistlistener.h"
+#include "pen.h"
 
 class ColorBox;
 class WidthBox;
 class LineTypeBox;
-class RS_Layer;
+class Layer;
 
 /**
  * A toolbar that offers all widgets for choosing a pen.
  */
-class PenToolBar: public QToolBar//, public RS_LayerListListener
+class PenToolBar: public QToolBar//, public LayerListListener
 {
 	Q_OBJECT
 
@@ -21,22 +21,22 @@ class PenToolBar: public QToolBar//, public RS_LayerListListener
 		PenToolBar(QMainWindow * parent = NULL, const char * name = NULL);
 		virtual ~PenToolBar();
 
-		RS_Pen getPen();
+		Pen getPen();
 
-		// Methods from RS_LayerListListener Interface:
-		virtual void layerActivated(RS_Layer *);
-		virtual void layerEdited(RS_Layer *);
+		// Methods from LayerListListener Interface:
+		virtual void layerActivated(Layer *);
+		virtual void layerEdited(Layer *);
 
 	public slots:
-		void slotColorChanged(const RS_Color & color);
+		void slotColorChanged(const Color & color);
 		void slotWidthChanged(RS2::LineWidth w);
 		void slotLineTypeChanged(RS2::LineType w);
 
 	signals:
-		void penChanged(RS_Pen);
+		void penChanged(Pen);
 
 	private:
-		RS_Pen currentPen;
+		Pen currentPen;
 		ColorBox * colorBox;
 		WidthBox * widthBox;
 		LineTypeBox * lineTypeBox;