X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Flayerdialog.cpp;h=facdab7597a00d0671f4496d52fe3919a5a35fb1;hb=5adb444f3e523d3fd028617ced72d1ea6661db21;hp=bc6eefba9a4ddca7d371be363a23f51ffd4025e8;hpb=865303923fcb231a171992b75a73364ff469ff8c;p=architektonas

diff --git a/src/forms/layerdialog.cpp b/src/forms/layerdialog.cpp
index bc6eefb..facdab7 100644
--- a/src/forms/layerdialog.cpp
+++ b/src/forms/layerdialog.cpp
@@ -16,8 +16,8 @@
 
 #include "layerdialog.h"
 
-#include "rs_layer.h"
-#include "rs_layerlist.h"
+#include "layer.h"
+#include "layerlist.h"
 
 LayerDialog::LayerDialog(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/):
 	QDialog(parent, flags), layer(NULL), layerList(NULL), layerName(""), editLayer(false)
@@ -29,7 +29,7 @@ LayerDialog::~LayerDialog()
 {
 }
 
-void LayerDialog::setLayer(RS_Layer * l)
+void LayerDialog::setLayer(Layer * l)
 {
 	layer = l;
 	layerName = layer->getName();
@@ -40,7 +40,7 @@ void LayerDialog::setLayer(RS_Layer * l)
 		ui.leName->setEnabled(false);
 }
 
-void LayerDialog::setLayerList(RS_LayerList * ll)
+void LayerDialog::setLayerList(LayerList * ll)
 {
 	layerList = ll;
 }
@@ -56,10 +56,10 @@ void LayerDialog::updateLayer()
 	layer->setPen(ui.wPen->getPen());
 #if 0
 //OK, the problem is the color widget is misreporting the color that's been set.
-RS_Color c = ui.wPen->getPen().getColor();
+Color c = ui.wPen->getPen().getColor();
 printf("LayerDialog::updateLayer() -> selected pen is %u, %u, %u\n", c.red(), c.green(), c.blue());
 std::cout << ui.wPen->getPen();
-RS_Pen p = layer->getPen();
+Pen p = layer->getPen();
 c = p.getColor();
 printf("LayerDialog::updateLayer() -> selected pen is %u, %u, %u\n", c.red(), c.green(), c.blue());
 std::cout << ui.wPen->getPen();
@@ -68,11 +68,11 @@ std::cout << ui.wPen->getPen();
 
 void LayerDialog::validate()
 {
-	if (layerList != NULL && (editLayer == FALSE || layerName != ui.leName->text()))
+	if (layerList && (!editLayer || layerName != ui.leName->text()))
 	{
-		RS_Layer * l = layerList->find(ui.leName->text().toLatin1());
+		Layer * l = layerList->find(ui.leName->text().toLatin1());
 
-		if (l != NULL)
+		if (l)
 		{
 			QMessageBox::information(parentWidget(), QMessageBox::tr("Layer Properties"),
 				 QMessageBox::tr("Layer with a name \"%1\" already exists. Please specify "