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

diff --git a/src/forms/layerdialog.cpp b/src/forms/layerdialog.cpp
index bc6eefb..aa8d735 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)
@@ -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());
 
-		if (l != NULL)
+		if (l)
 		{
 			QMessageBox::information(parentWidget(), QMessageBox::tr("Layer Properties"),
 				 QMessageBox::tr("Layer with a name \"%1\" already exists. Please specify "