In the middle of major refactoring...

[architektonas] / src / base / rs_line.cpp

diff --git a/src/base/rs_line.cpp b/src/base/rs_line.cpp
index 8813b3e699f43b34e078bd6b5a9ce9a1b16d8e40..32254bd2dbaf781b2b8314822bfd1d76764e3c07 100644 (file)
--- a/src/base/rs_line.cpp
+++ b/src/base/rs_line.cpp
@@ -15,9 +15,10 @@
 #include "rs_line.h"
 
 #include "rs_debug.h"
-#include "rs_graphicview.h"
 #include "drawing.h"
-#include "paintintf.h"
+#include "graphicview.h"
+#include "rs_linetypepattern.h"
+#include "paintinterface.h"
 
 /**
  * Constructor.
@@ -484,10 +485,9 @@ void RS_Line::moveRef(const Vector& ref, const Vector& offset)
     }
 }
 
-//void RS_Line::draw(RS_Painter * painter, RS_GraphicView * view, double patternOffset)
-void RS_Line::draw(PaintInterface * painter, RS_GraphicView * view, double patternOffset)
+void RS_Line::draw(PaintInterface * painter, GraphicView * view, double patternOffset)
 {
-       if (painter == NULL || view == NULL)
+       if (!painter || !view)
 //{
 //printf("RS_Line::draw(): Bailing out!!! painter=%08X, view=%08X\n", painter, view);
                return;
@@ -516,7 +516,7 @@ void RS_Line::draw(PaintInterface * painter, RS_GraphicView * view, double patte
        RS_LineTypePattern * pat = (isSelected() ? &patternSelected : view->getPattern(getPen().getLineType()));
 #endif
 
-       if (pat == NULL)
+       if (!pat)
        {
 //printf("RS_Line::draw(): Pattern == NULL!\n");
                RS_DEBUG->print(RS_Debug::D_WARNING, "RS_Line::draw: Invalid line pattern");