Bugfixes related to removing Snapper class.

[architektonas] / src / forms / cadtoolbarmain.cpp

diff --git a/src/forms/cadtoolbarmain.cpp b/src/forms/cadtoolbarmain.cpp
index e4748e3b3adec0293272783ea08a0fc753130330..ab47b215ed5fb2705d866030083959ab7ab9ee49 100644 (file)
--- a/src/forms/cadtoolbarmain.cpp
+++ b/src/forms/cadtoolbarmain.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>
 //
@@ -16,13 +18,13 @@
 
 #include "cadtoolbarmain.h"
 
-#include "qg_actionhandler.h"
+#include "actionhandler.h"
 #include "cadtoolbar.h"
 
 CadToolBarMain::CadToolBarMain(CadToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
        QWidget((QWidget *)parent, flags)
 {
-       QG_ActionHandler * actionHandler = parent->getActionHandler();
+       ActionHandler * actionHandler = parent->getActionHandler();
 
        gridLayout = new QGridLayout(this);
        gridLayout->setSpacing(0);
@@ -61,7 +63,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()