From 5d60e6a61f73d91e700aca55e6ecae06c9729196 Mon Sep 17 00:00:00 2001 From: Shamus Hammons Date: Wed, 23 Jun 2010 13:54:14 +0000 Subject: [PATCH] Removed spurious #endif from cadtoolbarmain.cpp --- src/actions/rs_actiondrawspline.cpp | 2 +- src/forms/cadtoolbarmain.cpp | 1 - src/widgets/qg_actionhandler.cpp | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/actions/rs_actiondrawspline.cpp b/src/actions/rs_actiondrawspline.cpp index 91fa9a1..533ca4b 100644 --- a/src/actions/rs_actiondrawspline.cpp +++ b/src/actions/rs_actiondrawspline.cpp @@ -69,7 +69,7 @@ void RS_ActionDrawSpline::trigger() container->addEntity(spline); // upd. undo list: - if (document != NULL) + if (document) { document->startUndoCycle(); document->addUndoable(spline); diff --git a/src/forms/cadtoolbarmain.cpp b/src/forms/cadtoolbarmain.cpp index e4748e3..afddfb1 100644 --- a/src/forms/cadtoolbarmain.cpp +++ b/src/forms/cadtoolbarmain.cpp @@ -61,7 +61,6 @@ CadToolBarMain::CadToolBarMain(CadToolBar * parent/*= 0*/, Qt::WindowFlags flags actionHandler, SLOT(slotBlocksCreate())); connect(CreateToolButton(10, 1, ":/res/qg_menuselect"), SIGNAL(clicked()), parent, SLOT(showToolBarSelect())); -#endif } CadToolBarMain::~CadToolBarMain() diff --git a/src/widgets/qg_actionhandler.cpp b/src/widgets/qg_actionhandler.cpp index 58ee599..2ddc8eb 100644 --- a/src/widgets/qg_actionhandler.cpp +++ b/src/widgets/qg_actionhandler.cpp @@ -495,7 +495,7 @@ RS_ActionInterface * QG_ActionHandler::setCurrentAction(RS2::ActionType id) a = new RS_ActionDimLinear(*doc, *gv, 0.0, true); break; case RS2::ActionDimLinearVer: - a = new RS_ActionDimLinear(*doc, *gv, M_PI/2.0, true); + a = new RS_ActionDimLinear(*doc, *gv, M_PI / 2.0, true); break; case RS2::ActionDimRadial: a = new RS_ActionDimRadial(*doc, *gv); -- 2.37.2