X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factionselect.cpp;h=e09cf28c2f92a40e0d8bacc7e3950c2ffae668a9;hb=5adb444f3e523d3fd028617ced72d1ea6661db21;hp=bd96b43ef83d32d92acd89fba8d63a12821a23ac;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas diff --git a/src/actions/actionselect.cpp b/src/actions/actionselect.cpp index bd96b43..e09cf28 100644 --- a/src/actions/actionselect.cpp +++ b/src/actions/actionselect.cpp @@ -20,7 +20,7 @@ #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) { @@ -45,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); } }