Refactored CAD tool bars to use predefined actions.

[architektonas] / src / forms / cadtoolbarmain.cpp

diff --git a/src/forms/cadtoolbarmain.cpp b/src/forms/cadtoolbarmain.cpp
index b2111e9a1f731fb02979ef6ad09925b9004f0616..f854a4a8cb9390e2bd0d13e9b61b8a7783f4cdfe 100644 (file)
--- a/src/forms/cadtoolbarmain.cpp
+++ b/src/forms/cadtoolbarmain.cpp
@@ -1,5 +1,6 @@
 // cadtoolbarmain.cpp
 //
+// 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
@@ -15,6 +16,8 @@
 
 #include "cadtoolbar.h"
 #include "qg_actionhandler.h"
+#include "createqtactions.h"
+#include "rs_debug.h"
 
 CadToolBarMain::CadToolBarMain(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
        QWidget(parent, flags)
@@ -25,6 +28,11 @@ CadToolBarMain::CadToolBarMain(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*=
 //#ifndef RS_PROF
 //     ui.bMenuPolyline->hide();
 //#endif
+
+//hm.
+//well, it looks like something else is messing with this...
+//     if (parent)
+//             ((QToolBar *)parent)->addWidget(this);
 }
 
 CadToolBarMain::~CadToolBarMain()
@@ -35,12 +43,12 @@ void CadToolBarMain::setCadToolBar(CadToolBar * tb)
 {
        QG_ActionHandler * ah = NULL;
 
-       if (tb != NULL)
+       if (tb)
                ah = tb->getActionHandler();
        else
-               RS_DEBUG->print(RS_Debug::D_ERROR, "QG_CadToolBarMain::setCadToolBar(): No valid toolbar set.");
+               RS_DEBUG->print(RS_Debug::D_ERROR, "CadToolBarMain::setCadToolBar(): No valid toolbar set.");
 
-       if (ah != NULL)
+       if (ah)
        {
                connect(ui.bMenuPoint, SIGNAL(clicked()), ah, SLOT(slotDrawPoint()));
                connect(ui.bMenuLine, SIGNAL(clicked()), tb, SLOT(showToolBarLines()));
@@ -62,7 +70,5 @@ void CadToolBarMain::setCadToolBar(CadToolBar * tb)
                connect(ui.bMenuSelect, SIGNAL(clicked()), tb, SLOT(showToolBarSelect()));
        }
        else
-       {
-               RS_DEBUG->print(RS_Debug::D_ERROR, "QG_CadToolBarMain::setCadToolBar(): No valid action handler set.");
-       }
+               RS_DEBUG->print(RS_Debug::D_ERROR, "CadToolBarMain::setCadToolBar(): No valid action handler set.");
 }