Bugfixes related to removing Snapper class.

[architektonas] / src / widgets / pentoolbar.h

diff --git a/src/widgets/pentoolbar.h b/src/widgets/pentoolbar.h
index 0a0fd5a99a13d9e9bae84b5062ea09190cd93580..9922bd3ef2b756e1eb4fe423fa7ba2c3c7cc9c0c 100644 (file)
--- a/src/widgets/pentoolbar.h
+++ b/src/widgets/pentoolbar.h
@@ -2,44 +2,44 @@
 #define __PENTOOLBAR_H__
 
 #include <QtGui>
-//#include "rs_layerlistlistener.h"
-#include "rs_pen.h"
+//#include "layerlistlistener.h"
+#include "pen.h"
 
-class QG_ColorBox;
-class QG_WidthBox;
-class QG_LineTypeBox;
-class RS_Layer;
+class ColorBox;
+class WidthBox;
+class LineTypeBox;
+class Layer;
 
 /**
  * A toolbar that offers all widgets for choosing a pen.
  */
-class QG_PenToolBar: public QToolBar//, public RS_LayerListListener
+class PenToolBar: public QToolBar//, public LayerListListener
 {
        Q_OBJECT
 
        public:
-               QG_PenToolBar(QMainWindow * parent = NULL, const char * name = NULL);
-               virtual ~QG_PenToolBar();
+               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;
-               QG_ColorBox * colorBox;
-               QG_WidthBox * widthBox;
-               QG_LineTypeBox * lineTypeBox;
+               Pen currentPen;
+               ColorBox * colorBox;
+               WidthBox * widthBox;
+               LineTypeBox * lineTypeBox;
 };
 
 #endif // __PENTOOLBAR_H__