Phase two of adding polyline functionality...

[architektonas] / src / actions / actionselectcontour.cpp

diff --git a/src/actions/actionselectcontour.cpp b/src/actions/actionselectcontour.cpp
index 0c018547d3d908558c8545f19aeb724f107ff693..66d6a7c19241509a0e6ef8d41439a03dfb3ba430 100644 (file)
--- a/src/actions/actionselectcontour.cpp
+++ b/src/actions/actionselectcontour.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,12 @@
 
 #include "actionselectcontour.h"
 
-#include "rs_dialogfactory.h"
-#include "rs_selection.h"
+#include "debug.h"
+#include "dialogfactory.h"
+#include "graphicview.h"
+#include "selection.h"
 
-ActionSelectContour::ActionSelectContour(RS_EntityContainer & container,
+ActionSelectContour::ActionSelectContour(EntityContainer & container,
        GraphicView & graphicView):
        ActionInterface("Select Contours", container, graphicView)
 {
@@ -39,17 +43,17 @@ void ActionSelectContour::trigger()
        {
                if (en->isAtomic())
                {
-                       RS_Selection s(*container, graphicView);
+                       Selection s(*container, graphicView);
                        s.selectContour(en);
 
-                       if (RS_DIALOGFACTORY)
-                               RS_DIALOGFACTORY->updateSelectionWidget(container->countSelected());
+                       if (DIALOGFACTORY)
+                               DIALOGFACTORY->updateSelectionWidget(container->countSelected());
                }
-               else if (RS_DIALOGFACTORY)
-                       RS_DIALOGFACTORY->commandMessage(tr("Entity must be an Atomic Entity."));
+               else if (DIALOGFACTORY)
+                       DIALOGFACTORY->commandMessage(tr("Entity must be an Atomic Entity."));
        }
        else
-               RS_DEBUG->print("ActionSelectContour::trigger: Entity is NULL\n");
+               DEBUG->print("ActionSelectContour::trigger: Entity is NULL\n");
 }
 
 void ActionSelectContour::mouseReleaseEvent(QMouseEvent * e)