Bugfixes related to removing Snapper class.

[architektonas] / src / actions / actionselect.cpp

diff --git a/src/actions/actionselect.cpp b/src/actions/actionselect.cpp
index ab19e14a0d8afac296242135c95c24fc75bc6962..e09cf28c2f92a40e0d8bacc7e3950c2ffae668a9 100644 (file)
--- a/src/actions/actionselect.cpp
+++ b/src/actions/actionselect.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>
 //
@@ -15,10 +17,10 @@
 #include "actionselect.h"
 
 #include "actionselectsingle.h"
-#include "rs_dialogfactory.h"
+#include "dialogfactory.h"
 #include "graphicview.h"
 
-ActionSelect::ActionSelect(RS_EntityContainer & container, GraphicView & graphicView,
+ActionSelect::ActionSelect(EntityContainer & container, GraphicView & graphicView,
        RS2::ActionType nextAction):
        ActionInterface("Select Entities", container, graphicView)
 {
@@ -43,11 +45,11 @@ void ActionSelect::mouseReleaseEvent(QMouseEvent * e)
 
 void ActionSelect::updateToolBar()
 {
-       if (RS_DIALOGFACTORY)
+       if (DIALOGFACTORY)
        {
                if (!isFinished())
-                       RS_DIALOGFACTORY->requestToolBarSelect(this, nextAction);
+                       DIALOGFACTORY->requestToolBarSelect(this, nextAction);
                else
-                       RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarMain);
+                       DIALOGFACTORY->requestToolBar(RS2::ToolBarMain);
        }
 }