Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / widgets / pentoolbar.h

diff --git a/src/widgets/pentoolbar.h b/src/widgets/pentoolbar.h
index 1a3b5fb68388269a8f13d804fcda9d4a767fad56..9922bd3ef2b756e1eb4fe423fa7ba2c3c7cc9c0c 100644 (file)
--- a/src/widgets/pentoolbar.h
+++ b/src/widgets/pentoolbar.h
@@ -8,12 +8,12 @@
 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;