In the middle of major refactoring...

[architektonas] / src / base / rs_entitycontainer.cpp

diff --git a/src/base/rs_entitycontainer.cpp b/src/base/rs_entitycontainer.cpp
index 85a38b5e8d629104fd6b0c06cec2dfec52771fdb..94f3a4ceb09aa4382b809454d930436bb49a5b70 100644 (file)
--- a/src/base/rs_entitycontainer.cpp
+++ b/src/base/rs_entitycontainer.cpp
@@ -24,8 +24,8 @@
 #include "rs_insert.h"
 #include "rs_spline.h"
 #include "rs_information.h"
-#include "rs_graphicview.h"
-#include "paintintf.h"
+#include "graphicview.h"
+#include "paintinterface.h"
 
 bool RS_EntityContainer::autoUpdateBorders = true;
 
@@ -348,7 +348,7 @@ void RS_EntityContainer::addEntity(RS_Entity * entity)
        */
 //printf("RS_EntityContainer::addEntity(): entity=%08X\n", entity);
 
-       if (entity == NULL)
+       if (!entity)
                return;
 
        if (entity->rtti() == RS2::EntityImage || entity->rtti() == RS2::EntityHatch)
@@ -1680,8 +1680,7 @@ void RS_EntityContainer::moveSelectedRef(const Vector & ref, const Vector & offs
         calculateBorders();
 }
 
-//void RS_EntityContainer::draw(RS_Painter* painter, RS_GraphicView* view,
-void RS_EntityContainer::draw(PaintInterface * painter, RS_GraphicView * view, double /*patternOffset*/)
+void RS_EntityContainer::draw(PaintInterface * painter, GraphicView * view, double /*patternOffset*/)
 {
        if (painter == NULL || view == NULL)
                return;