X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factionselect.cpp;h=e09cf28c2f92a40e0d8bacc7e3950c2ffae668a9;hb=f62cebc26c7c3af447f0e4e4c43331f8589dce22;hp=bea5f37633b9af9d99f3184658500888b69ff922;hpb=865303923fcb231a171992b75a73364ff469ff8c;p=architektonas diff --git a/src/actions/actionselect.cpp b/src/actions/actionselect.cpp index bea5f37..e09cf28 100644 --- a/src/actions/actionselect.cpp +++ b/src/actions/actionselect.cpp @@ -17,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) { @@ -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); } }