Removed spurious #endif from cadtoolbarmain.cpp

diff --git a/src/actions/rs_actiondrawspline.cpp b/src/actions/rs_actiondrawspline.cpp
index 91fa9a1b5ef89b04713ce135ddb97dbc7ee3dbe8..533ca4b6625c422db3d6d0da7502c7eefba6dca3 100644 (file)
--- 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 e4748e3b3adec0293272783ea08a0fc753130330..afddfb1bf954750e272107b1c82dedf54766ffbc 100644 (file)
--- 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 58ee599f99ebccc89ce22bcf044aa32e7b818f3c..2ddc8eba284c1e3fb8c05b7391e62746707664d2 100644 (file)
--- 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);