Bugfixes related to removing Snapper class.

[architektonas] / src / widgets / pentoolbar.cpp

diff --git a/src/widgets/pentoolbar.cpp b/src/widgets/pentoolbar.cpp
index fd96c6cba4459f5348ae0534cb2bc63374190200..fa6caee8142d6f98dac6f17e20630f052d94a4e0 100644 (file)
--- a/src/widgets/pentoolbar.cpp
+++ b/src/widgets/pentoolbar.cpp
@@ -21,7 +21,7 @@
 #include "colorbox.h"
 #include "widthbox.h"
 #include "linetypebox.h"
-#include "rs_layer.h"
+#include "layer.h"
 
 /**
  * Constructor.
@@ -38,8 +38,8 @@ PenToolBar::PenToolBar(QMainWindow * parent/*= NULL*/, const char * name/*= NULL
        widthBox->setMinimumWidth(80);
        lineTypeBox->setMinimumWidth(80);
 
-       connect(colorBox, SIGNAL(colorChanged(const RS_Color &)), this,
-               SLOT(slotColorChanged(const RS_Color &)));
+       connect(colorBox, SIGNAL(colorChanged(const Color &)), this,
+               SLOT(slotColorChanged(const Color &)));
        connect(widthBox, SIGNAL(widthChanged(RS2::LineWidth)), this,
                SLOT(slotWidthChanged(RS2::LineWidth)));
        connect(lineTypeBox, SIGNAL(lineTypeChanged(RS2::LineType)), this,
@@ -64,7 +64,7 @@ PenToolBar::~PenToolBar()
        delete lineTypeBox;
 }
 
-RS_Pen PenToolBar::getPen()
+Pen PenToolBar::getPen()
 {
        return currentPen;
 }
@@ -73,7 +73,7 @@ RS_Pen PenToolBar::getPen()
  * Called by the layer list if this object was added as a listener
  * to a layer list.
  */
-void PenToolBar::layerActivated(RS_Layer * l)
+void PenToolBar::layerActivated(Layer * l)
 {
        //printf("PenToolBar::layerActivated\n");
 
@@ -97,14 +97,14 @@ void PenToolBar::layerActivated(RS_Layer * l)
  * Called by the layer list (if this object was previously
  * added as a listener to a layer list).
  */
-void PenToolBar::layerEdited(RS_Layer *)
+void PenToolBar::layerEdited(Layer *)
 {
 }
 
 /**
  * Called when the color was changed by the user.
  */
-void PenToolBar::slotColorChanged(const RS_Color & color)
+void PenToolBar::slotColorChanged(const Color & color)
 {
        currentPen.setColor(color);
        //printf("  color changed\n");