X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fcadtoolbar.cpp;h=e9cdcd436667747d28cf167c0cd303bd6e40b6f4;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=8a09e77e6909c713db2ff0a25402287ea3e9c92e;hpb=c5e595b3156fdf5f93ab6a1032dcc77e859ac6fa;p=architektonas

diff --git a/src/forms/cadtoolbar.cpp b/src/forms/cadtoolbar.cpp
index 8a09e77..e9cdcd4 100644
--- a/src/forms/cadtoolbar.cpp
+++ b/src/forms/cadtoolbar.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>
 //
@@ -27,7 +29,7 @@
 #include "cadtoolbarselect.h"
 #include "cadtoolbarsnap.h"
 #include "cadtoolbarsplines.h"
-#include "rs.h"
+#include "enums.h"
 
 CadToolBar::CadToolBar(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
 	QWidget(parent, flags), actionHandler(NULL), currentTb(NULL), tbSplines(NULL),
@@ -57,7 +59,7 @@ CadToolBar::~CadToolBar()
 /**
  * @return Pointer to action handler or NULL.
  */
-QG_ActionHandler * CadToolBar::getActionHandler()
+ActionHandler * CadToolBar::getActionHandler()
 {
 	return actionHandler;
 }
@@ -98,7 +100,7 @@ void CadToolBar::contextMenuEvent(QContextMenuEvent * e)
  *
  * @param ah Pointer to action handler which will deal with the actions in this tool bar.
  */
-void CadToolBar::createSubToolBars(QG_ActionHandler * ah)
+void CadToolBar::createSubToolBars(ActionHandler * ah)
 {
 	actionHandler = ah;
 	tbMain = new CadToolBarMain(this);
@@ -256,7 +258,7 @@ void CadToolBar::showToolBarSelect()
 	showToolBarSelect(NULL, -1);
 }
 
-void CadToolBar::showToolBarSelect(RS_ActionInterface * selectAction, int nextAction)
+void CadToolBar::showToolBarSelect(ActionInterface * selectAction, int nextAction)
 {
 	tbSelect->setNextAction(nextAction);
 	tbSelect->setSelectAction(selectAction);