X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Frs_selection.cpp;h=60863ca1fc36e5ca0aa86ccae747311abdddb603;hb=20cce16e98fc9b052c5862efa6394a285971e846;hp=046775b7375540cca4f04c325f7631f02fd7fd83;hpb=89e127aa3dbd74d3158e6dbe0ca1703420c04395;p=architektonas

diff --git a/src/base/rs_selection.cpp b/src/base/rs_selection.cpp
index 046775b..60863ca 100644
--- a/src/base/rs_selection.cpp
+++ b/src/base/rs_selection.cpp
@@ -3,7 +3,9 @@
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // Extensively rewritten and refactored by James L. Hammons
-// (C) 2010 Underground Software
+// Portions copyright (C) 2001-2003 RibbonSoft
+// Copyright (C) 2010 Underground Software
+// See the README and GPLv2 files for licensing and warranty information
 //
 // JLH = James L. Hammons <jlhamm@acm.org>
 //
@@ -14,10 +16,11 @@
 
 #include "rs_selection.h"
 
+#include "drawing.h"
+#include "rs_entity.h"
+#include "graphicview.h"
 #include "rs_information.h"
 #include "rs_polyline.h"
-#include "rs_entity.h"
-#include "drawing.h"
 
 /**
  * Default constructor.
@@ -26,7 +29,7 @@
  *        entities. Usually that's an Drawing entity but
  *        it can also be a polyline, text, ...
  */
-RS_Selection::RS_Selection(RS_EntityContainer & container, RS_GraphicView * graphicView)
+RS_Selection::RS_Selection(RS_EntityContainer & container, GraphicView * graphicView)
 {
 	this->container = &container;
 	this->graphicView = graphicView;
@@ -38,7 +41,7 @@ RS_Selection::RS_Selection(RS_EntityContainer & container, RS_GraphicView * grap
  */
 void RS_Selection::selectSingle(RS_Entity * e)
 {
-	if (e != NULL && (e->getLayer() == NULL || e->getLayer()->isLocked() == false))
+	if (e && (e->getLayer() == NULL || e->getLayer()->isLocked() == false))
 	{
 // Same problem as below...
 //[WAS]#warning "!!! This is causing a segfault in the draw code !!!"