Start of bringing back missing forms/dialogs

[architektonas] / src / base / rs_snapper.cpp

diff --git a/src/base/rs_snapper.cpp b/src/base/rs_snapper.cpp
index e670a08312022b1403ed01225adb234f3aa219e9..016b48db92b2e0350ca3565b19e59ddc56fb0d85 100644 (file)
--- a/src/base/rs_snapper.cpp
+++ b/src/base/rs_snapper.cpp
@@ -1,5 +1,6 @@
 // rs_snapper.cpp
 //
+// 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
@@ -14,8 +15,8 @@
 #include "rs_snapper.h"
 
 #include "rs_dialogfactory.h"
+#include "drawing.h"
 #include "rs_entitycontainer.h"
-#include "rs_graphic.h"
 #include "rs_graphicview.h"
 #include "rs_grid.h"
 #include "rs_information.h"
@@ -211,8 +212,8 @@ Vector RS_Snapper::snapFree(Vector coord)
 Vector RS_Snapper::snapEndpoint(Vector coord)
 {
        Vector vec(false);
-
        vec = container->getNearestEndpoint(coord, NULL/*, &keyEntity*/);
+
        return vec;
 }
 
@@ -278,6 +279,7 @@ Vector RS_Snapper::snapOnEntity(Vector coord)
 {
        Vector vec(false);
        vec = container->getNearestPointOnEntity(coord, true, NULL, &keyEntity);
+
        return vec;
 }
 
@@ -290,8 +292,8 @@ Vector RS_Snapper::snapOnEntity(Vector coord)
 Vector RS_Snapper::snapCenter(Vector coord)
 {
        Vector vec(false);
-
        vec = container->getNearestCenter(coord, NULL);
+
        return vec;
 }
 
@@ -304,8 +306,8 @@ Vector RS_Snapper::snapCenter(Vector coord)
 Vector RS_Snapper::snapMiddle(Vector coord)
 {
        Vector vec(false);
-
        vec = container->getNearestMiddle(coord, NULL);
+
        return vec;
 }
 
@@ -318,8 +320,8 @@ Vector RS_Snapper::snapMiddle(Vector coord)
 Vector RS_Snapper::snapDist(Vector coord)
 {
        Vector vec(false);
-
        vec = container->getNearestDist(distance, coord, NULL);
+
        return vec;
 }
 
@@ -332,8 +334,8 @@ Vector RS_Snapper::snapDist(Vector coord)
 Vector RS_Snapper::snapIntersection(Vector coord)
 {
        Vector vec(false);
-
        vec = container->getNearestIntersection(coord, NULL);
+
        return vec;
 }
 
@@ -462,7 +464,7 @@ void RS_Snapper::resume()
 void RS_Snapper::hideOptions()
 {
        if (snapMode == RS2::SnapDist)
-               if (RS_DIALOGFACTORY!=NULL)
+               if (RS_DIALOGFACTORY != NULL)
                        RS_DIALOGFACTORY->requestSnapDistOptions(distance, false);
 }