Bugfixes related to removing Snapper class.

[architektonas] / src / forms / arctangentialoptions.cpp

diff --git a/src/forms/arctangentialoptions.cpp b/src/forms/arctangentialoptions.cpp
index 54a92f2519ca535c6df052131c4b3312cd6f4fe7..99c5fac26b598205f793c2a23d0be3c377e317a5 100644 (file)
--- a/src/forms/arctangentialoptions.cpp
+++ b/src/forms/arctangentialoptions.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 <jlhamm@acm.org>
 //
@@ -14,18 +16,18 @@
 
 #include "arctangentialoptions.h"
 
-#include "rs_actiondrawarctangential.h"
+#include "actiondrawarctangential.h"
+#include "debug.h"
 #include "settings.h"
 
 ArcTangentialOptions::ArcTangentialOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
-       QWidget(parent, flags)
+       QWidget(parent, flags),
+       lRadius(new QLabel(tr("Radius:"))),
+       leRadius(new QLineEdit(this))
 {
-#if 1
        QHBoxLayout * layout = new QHBoxLayout(this);
        layout->setContentsMargins(0, 0, 0, 0);
 
-       lRadius = new QLabel(tr("Radius:"));
-       leRadius = new QLineEdit(this);
        leRadius->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Ignored));
 
        layout->addWidget(lRadius);
@@ -37,54 +39,6 @@ ArcTangentialOptions::ArcTangentialOptions(QToolBar * parent/*= 0*/, Qt::WindowF
        // nothing will show up on the screen. :-)
        if (parent)
                parent->addWidget(this);
-#else
-       if (objectName().isEmpty())
-               setObjectName(QString::fromUtf8("ArcTangentialOptions"));
-
-       resize(160, 24);
-       QSizePolicy policy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-       policy.setHorizontalStretch(0);
-       policy.setVerticalStretch(0);
-       policy.setHeightForWidth(sizePolicy().hasHeightForWidth());
-       setSizePolicy(policy);
-       setMinimumSize(QSize(160, 22));
-
-       QHBoxLayout * hboxLayout = new QHBoxLayout(this);
-       hboxLayout->setSpacing(6);
-       hboxLayout->setContentsMargins(0, 0, 0, 0);
-       hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
-       lRadius = new QLabel(this);
-       lRadius->setObjectName(QString::fromUtf8("lRadius"));
-       lRadius->setWordWrap(false);
-
-       hboxLayout->addWidget(lRadius);
-
-       leRadius = new QLineEdit(this);
-       leRadius->setObjectName(QString::fromUtf8("leRadius"));
-       QSizePolicy sizePolicy1(QSizePolicy::Ignored, QSizePolicy::Fixed);
-       sizePolicy1.setHorizontalStretch(0);
-       sizePolicy1.setVerticalStretch(0);
-       sizePolicy1.setHeightForWidth(leRadius->sizePolicy().hasHeightForWidth());
-       leRadius->setSizePolicy(sizePolicy1);
-
-       hboxLayout->addWidget(leRadius);
-
-       sep1 = new QFrame(this);
-       sep1->setObjectName(QString::fromUtf8("sep1"));
-       QSizePolicy sizePolicy2(QSizePolicy::Fixed, QSizePolicy::Minimum);
-       sizePolicy2.setHorizontalStretch(0);
-       sizePolicy2.setVerticalStretch(0);
-       sizePolicy2.setHeightForWidth(sep1->sizePolicy().hasHeightForWidth());
-       sep1->setSizePolicy(sizePolicy2);
-       sep1->setFrameShape(QFrame::VLine);
-       sep1->setFrameShadow(QFrame::Sunken);
-
-       hboxLayout->addWidget(sep1);
-
-//     retranslateUi(ArcTangentialOptions);
-       QObject::connect(leRadius, SIGNAL(textChanged(QString)), this, SLOT(updateRadius(QString)));
-       QMetaObject::connectSlotsByName(this);
-#endif
 }
 
 ArcTangentialOptions::~ArcTangentialOptions()
@@ -94,11 +48,11 @@ ArcTangentialOptions::~ArcTangentialOptions()
        settings.endGroup();
 }
 
-void ArcTangentialOptions::setAction(RS_ActionInterface * a, bool update)
+void ArcTangentialOptions::setAction(ActionInterface * a, bool update)
 {
        if (a != NULL && a->rtti() == RS2::ActionDrawArcTangential)
        {
-               action = (RS_ActionDrawArcTangential *)a;
+               action = (ActionDrawArcTangential *)a;
 
                QString sr;
 
@@ -115,7 +69,7 @@ void ArcTangentialOptions::setAction(RS_ActionInterface * a, bool update)
        }
        else
        {
-               RS_DEBUG->print(RS_Debug::D_ERROR,
+               DEBUG->print(Debug::D_ERROR,
                        "ArcTangentialOptions::setAction: wrong action type");
                action = NULL;
        }
@@ -130,7 +84,7 @@ void ArcTangentialOptions::setAction(RS_ActionInterface * a, bool update)
     rbNeg->setChecked(reversed);
    }*/
 
-/*void ArcTangentialOptions::setData(RS_ArcData* d) {
+/*void ArcTangentialOptions::setData(ArcData* d) {
     data = d;
     updateDirection(false);
    }*/
@@ -138,6 +92,6 @@ void ArcTangentialOptions::setAction(RS_ActionInterface * a, bool update)
 void ArcTangentialOptions::updateRadius(const QString & s)
 {
        if (action != NULL)
-               action->setRadius(RS_Math::eval(s));
+               action->setRadius(Math::eval(s));
 }