X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Flineoptions.cpp;h=5f3696ceab82dfea6fcaf3b6b0196758669053ea;hb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;hp=0cca77d1bd2f93c3be3bc0f41d8365d8f48bb925;hpb=05a1d5fa057f4f45bc1f9903f1bdc0be2f10e3bf;p=architektonas diff --git a/src/forms/lineoptions.cpp b/src/forms/lineoptions.cpp index 0cca77d..5f3696c 100644 --- a/src/forms/lineoptions.cpp +++ b/src/forms/lineoptions.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 // @@ -15,8 +17,9 @@ #include "lineoptions.h" #include "rs.h" -#include "rs_actiondrawline.h" -#include "rs_actioninterface.h" +#include "actiondrawline.h" +#include "actioninterface.h" +#include "debug.h" LineOptions::LineOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): QWidget(parent, flags), action(NULL), @@ -45,11 +48,12 @@ LineOptions::~LineOptions() { } -void LineOptions::setAction(RS_ActionInterface * a) +//void LineOptions::setAction(ActionInterface * a) +void LineOptions::setAction(ActionInterface * a) { if (a != NULL && a->rtti() == RS2::ActionDrawLine) { - action = (RS_ActionDrawLine *)a; + action = (ActionDrawLine *)a; } else {