X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fwidgets%2Fpentoolbar.cpp;h=fa6caee8142d6f98dac6f17e20630f052d94a4e0;hb=5adb444f3e523d3fd028617ced72d1ea6661db21;hp=87bfbe4c2b84d3892cb0213a47cce95039627f48;hpb=e5a77a32dbe17d9534d3099f1fd3fdacba199516;p=architektonas

diff --git a/src/widgets/pentoolbar.cpp b/src/widgets/pentoolbar.cpp
index 87bfbe4..fa6caee 100644
--- a/src/widgets/pentoolbar.cpp
+++ b/src/widgets/pentoolbar.cpp
@@ -21,16 +21,16 @@
 #include "colorbox.h"
 #include "widthbox.h"
 #include "linetypebox.h"
-#include "rs_layer.h"
+#include "layer.h"
 
 /**
  * Constructor.
  */
-QG_PenToolBar::QG_PenToolBar(QMainWindow * parent/*= NULL*/, const char * name/*= NULL*/):
+PenToolBar::PenToolBar(QMainWindow * parent/*= NULL*/, const char * name/*= NULL*/):
 	QToolBar(parent),
-	colorBox(new QG_ColorBox(true, false, this, "colorbox")),
-	widthBox(new QG_WidthBox(true, false, this, "widthbox")),
-	lineTypeBox(new QG_LineTypeBox(true, false, this, "lineTypebox"))
+	colorBox(new ColorBox(true, false, this, "colorbox")),
+	widthBox(new WidthBox(true, false, this, "widthbox")),
+	lineTypeBox(new LineTypeBox(true, false, this, "lineTypebox"))
 {
 	setWindowTitle(name);
 
@@ -38,8 +38,8 @@ QG_PenToolBar::QG_PenToolBar(QMainWindow * parent/*= NULL*/, const char * name/*
 	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,
@@ -57,14 +57,14 @@ QG_PenToolBar::QG_PenToolBar(QMainWindow * parent/*= NULL*/, const char * name/*
 /**
  * Destructor
  */
-QG_PenToolBar::~QG_PenToolBar()
+PenToolBar::~PenToolBar()
 {
 	delete colorBox;
 	delete widthBox;
 	delete lineTypeBox;
 }
 
-RS_Pen QG_PenToolBar::getPen()
+Pen PenToolBar::getPen()
 {
 	return currentPen;
 }
@@ -73,9 +73,9 @@ RS_Pen QG_PenToolBar::getPen()
  * Called by the layer list if this object was added as a listener
  * to a layer list.
  */
-void QG_PenToolBar::layerActivated(RS_Layer * l)
+void PenToolBar::layerActivated(Layer * l)
 {
-	//printf("QG_PenToolBar::layerActivated\n");
+	//printf("PenToolBar::layerActivated\n");
 
 	if (l == NULL)
 		return;
@@ -97,14 +97,14 @@ void QG_PenToolBar::layerActivated(RS_Layer * l)
  * Called by the layer list (if this object was previously
  * added as a listener to a layer list).
  */
-void QG_PenToolBar::layerEdited(RS_Layer *)
+void PenToolBar::layerEdited(Layer *)
 {
 }
 
 /**
  * Called when the color was changed by the user.
  */
-void QG_PenToolBar::slotColorChanged(const RS_Color & color)
+void PenToolBar::slotColorChanged(const Color & color)
 {
 	currentPen.setColor(color);
 	//printf("  color changed\n");
@@ -115,7 +115,7 @@ void QG_PenToolBar::slotColorChanged(const RS_Color & color)
 /**
  * Called when the width was changed by the user.
  */
-void QG_PenToolBar::slotWidthChanged(RS2::LineWidth w)
+void PenToolBar::slotWidthChanged(RS2::LineWidth w)
 {
 	currentPen.setWidth(w);
 	//printf("  width changed\n");
@@ -126,7 +126,7 @@ void QG_PenToolBar::slotWidthChanged(RS2::LineWidth w)
 /**
  * Called when the linetype was changed by the user.
  */
-void QG_PenToolBar::slotLineTypeChanged(RS2::LineType w)
+void PenToolBar::slotLineTypeChanged(RS2::LineType w)
 {
 	currentPen.setLineType(w);
 	//printf("  line type changed\n");