X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmainapp%2Fapplicationwindow.cpp;h=61da6669ace723653860ff09da7b1fcbdeb6a28d;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=42c90ccc72190f1325e2832dd608fe06b5a61449;hpb=d86611a87f46873819dfae63f1112b248ba9aca1;p=architektonas

diff --git a/src/mainapp/applicationwindow.cpp b/src/mainapp/applicationwindow.cpp
index 42c90cc..61da666 100644
--- a/src/mainapp/applicationwindow.cpp
+++ b/src/mainapp/applicationwindow.cpp
@@ -22,34 +22,34 @@
 #include "actiondrawlinefree.h"
 #include "actionlibraryinsert.h"
 #include "actionprintpreview.h"
-#include "rs_creation.h"
-#include "rs_dialogfactory.h"
-#include "rs_dimaligned.h"
-#include "rs_dimlinear.h"
-#include "rs_dimradial.h"
-#include "rs_ellipse.h"
-#include "rs_fileio.h"
-#include "rs_hatch.h"
-#include "rs_insert.h"
-#include "rs_image.h"
+#include "creation.h"
+#include "dialogfactory.h"
+#include "dimaligned.h"
+#include "dimlinear.h"
+#include "dimradial.h"
+#include "ellipse.h"
+#include "fileio.h"
+#include "hatch.h"
+#include "insert.h"
+#include "image.h"
 #include "paintinterface.h"
-#include "rs_script.h"
-#include "rs_scriptlist.h"
+#include "script.h"
+#include "scriptlist.h"
 #include "settings.h"
-#include "rs_solid.h"
-#include "rs_staticgraphicview.h"
-#include "rs_system.h"
-#include "rs_text.h"
-#include "rs_units.h"
+#include "solid.h"
+#include "staticgraphicview.h"
+#include "system.h"
+#include "text.h"
+#include "units.h"
 
 #ifdef RS_CAM
-#include "rs_camdialog.h"
-#include "rs_simulationcontrols.h"
+#include "camdialog.h"
+#include "simulationcontrols.h"
 #endif
 
-#include "qg_colorbox.h"
-#include "qg_filedialog.h"
-#include "qg_pentoolbar.h"
+#include "colorbox.h"
+#include "filedialog.h"
+#include "pentoolbar.h"
 #include "recentfiles.h"
 #include "cadtoolbar.h"
 #include "cadtoolbarmain.h"
@@ -82,56 +82,56 @@ ApplicationWindow::ApplicationWindow():
 //	Q3MainWindow(0, "", Qt::WDestructiveClose), QG_MainWindowInterface()
 	QMainWindow((QWidget *)NULL/*,this is not a Qt::WindowFlags --> Qt::WA_DeleteOnClose*/), QG_MainWindowInterface()
 {
-	RS_DEBUG->print("ApplicationWindow::ApplicationWindow");
+	DEBUG->print("ApplicationWindow::ApplicationWindow");
 
 	appWindow = this;
 //no    assistant = NULL;
 	workspace = NULL;
 
-	RS_DEBUG->print("ApplicationWindow::ApplicationWindow: setting icon");
+	DEBUG->print("ApplicationWindow::ApplicationWindow: setting icon");
 //	setIcon(qPixmapFromMimeSource(QC_APP_ICON));
 //	setWindowIcon(qPixmapFromMimeSource(QC_APP_ICON));
 	setWindowIcon(QIcon(":/res/" QC_APP_ICON));
 	CreateQtActions(this);
 
-	RS_DEBUG->print("ApplicationWindow::ApplicationWindow: creating action handler");
-	actionHandler = new QG_ActionHandler(this);
-	RS_DEBUG->print("ApplicationWindow::ApplicationWindow: creating action handler: OK");
+	DEBUG->print("ApplicationWindow::ApplicationWindow: creating action handler");
+	actionHandler = new ActionHandler(this);
+	DEBUG->print("ApplicationWindow::ApplicationWindow: creating action handler: OK");
 
-#ifdef RS_SCRIPTING
-	RS_DEBUG->print("ApplicationWindow::ApplicationWindow: creating scripter");
+#ifdef SCRIPTING
+	DEBUG->print("ApplicationWindow::ApplicationWindow: creating scripter");
 	scripter = new QS_Scripter(this, this);
-	RS_DEBUG->print("ApplicationWindow::ApplicationWindow: creating scripter: OK");
+	DEBUG->print("ApplicationWindow::ApplicationWindow: creating scripter: OK");
 #endif
 
-	RS_DEBUG->print("ApplicationWindow::ApplicationWindow: init view");
+	DEBUG->print("ApplicationWindow::ApplicationWindow: init view");
 	initView();
-	RS_DEBUG->print("ApplicationWindow::ApplicationWindow: init toolbar");
+	DEBUG->print("ApplicationWindow::ApplicationWindow: init toolbar");
 	initToolBar();
-	RS_DEBUG->print("ApplicationWindow::ApplicationWindow: init actions");
+	DEBUG->print("ApplicationWindow::ApplicationWindow: init actions");
 	initActions();
-	RS_DEBUG->print("ApplicationWindow::ApplicationWindow: init menu bar");
+	DEBUG->print("ApplicationWindow::ApplicationWindow: init menu bar");
 	initMenuBar();
-	RS_DEBUG->print("ApplicationWindow::ApplicationWindow: init status bar");
+	DEBUG->print("ApplicationWindow::ApplicationWindow: init status bar");
 	initStatusBar();
 
-	RS_DEBUG->print("ApplicationWindow::ApplicationWindow: creating dialogFactory");
+	DEBUG->print("ApplicationWindow::ApplicationWindow: creating dialogFactory");
 	dialogFactory = new QC_DialogFactory(this, optionWidget);
-	RS_DEBUG->print("ApplicationWindow::ApplicationWindow: creating dialogFactory: OK");
-	RS_DEBUG->print("setting dialog factory object");
+	DEBUG->print("ApplicationWindow::ApplicationWindow: creating dialogFactory: OK");
+	DEBUG->print("setting dialog factory object");
 
-	if (RS_DialogFactory::instance() == NULL)
-		RS_DEBUG->print("no RS_DialogFactory instance");
+	if (DialogFactory::instance() == NULL)
+		DEBUG->print("no DialogFactory instance");
 	else
-		RS_DEBUG->print("got RS_DialogFactory instance");
+		DEBUG->print("got DialogFactory instance");
 
-	RS_DialogFactory::instance()->setFactoryObject(dialogFactory);
-	RS_DEBUG->print("setting dialog factory object: OK");
+	DialogFactory::instance()->setFactoryObject(dialogFactory);
+	DEBUG->print("setting dialog factory object: OK");
 
-	RS_DEBUG->print("ApplicationWindow::ApplicationWindow: init settings");
+	DEBUG->print("ApplicationWindow::ApplicationWindow: init settings");
 	initSettings();
 
-	RS_DEBUG->print("ApplicationWindow::ApplicationWindow: init MDI");
+	DEBUG->print("ApplicationWindow::ApplicationWindow: init MDI");
 	initMDI();
 
 	// Disable menu and toolbar items
@@ -147,29 +147,29 @@ ApplicationWindow::ApplicationWindow():
  */
 ApplicationWindow::~ApplicationWindow()
 {
-	RS_DEBUG->print("ApplicationWindow::~ApplicationWindow");
-#ifdef RS_SCRIPTING
-	RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting scripter");
+	DEBUG->print("ApplicationWindow::~ApplicationWindow");
+#ifdef SCRIPTING
+	DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting scripter");
 	delete scripter;
-	RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting scripter: OK");
+	DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting scripter: OK");
 #endif
 
-	RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting action handler");
+	DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting action handler");
 	delete actionHandler;
-	RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting action handler: OK");
+	DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting action handler: OK");
 
-	RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting dialog factory");
+	DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting dialog factory");
 	delete dialogFactory;
-	RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting dialog factory: OK");
+	DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting dialog factory: OK");
 
-//no    RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: "
+//no    DEBUG->print("ApplicationWindow::~ApplicationWindow: "
 //                    "deleting assistant..");
 //    if (assistant!=NULL) {
 //        delete assistant;
 //    }
-//    RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: "
+//    DEBUG->print("ApplicationWindow::~ApplicationWindow: "
 //                    "deleting assistant: OK");
-	RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: OK");
+	DEBUG->print("ApplicationWindow::~ApplicationWindow: OK");
 }
 
 /**
@@ -186,14 +186,14 @@ void ApplicationWindow::slotRunStartScript()
  */
 void ApplicationWindow::slotRunScript()
 {
-	RS_DEBUG->print("ApplicationWindow::slotRunScript");
+	DEBUG->print("ApplicationWindow::slotRunScript");
 
 	const QObject * s = sender();
 
 	if (s != NULL)
 	{
 		QString script = ((QAction *)s)->text();
-		RS_DEBUG->print("ApplicationWindow::slotRunScript: %s", script.toLatin1().data());
+		DEBUG->print("ApplicationWindow::slotRunScript: %s", script.toLatin1().data());
 		slotRunScript(script);
 	}
 }
@@ -203,28 +203,28 @@ void ApplicationWindow::slotRunScript()
  */
 void ApplicationWindow::slotRunScript(const QString & name)
 {
-#ifdef RS_SCRIPTING
-	RS_DEBUG->print("ApplicationWindow::slotRunScript");
+#ifdef SCRIPTING
+	DEBUG->print("ApplicationWindow::slotRunScript");
 
 	if (scripter == NULL)
 	{
-		RS_DEBUG->print(RS_Debug::D_WARNING, "ApplicationWindow::slotRunScript: scripter not initialized");
+		DEBUG->print(Debug::D_WARNING, "ApplicationWindow::slotRunScript: scripter not initialized");
 		return;
 	}
 
     statusBar()->showMessage(tr("Running script '%1'").arg(name), 2000);
 
-	QStringList scriptList = RS_SYSTEM->getScriptList();
-	scriptList.append(RS_SYSTEM->getHomeDir() + "/.qcad/" + name);
+	QStringList scriptList = SYSTEM->getScriptList();
+	scriptList.append(SYSTEM->getHomeDir() + "/.architektonas/" + name);
 
 	for (QStringList::Iterator it = scriptList.begin(); it!=scriptList.end(); ++it)
 	{
-		RS_DEBUG->print("ApplicationWindow::slotRunScript: checking script '%s'", (*it).toLatin1().data();
+		DEBUG->print("ApplicationWindow::slotRunScript: checking script '%s'", (*it).toLatin1().data();
 		QFileInfo fi(*it);
 
 		if (fi.exists() && fi.fileName() == name)
 		{
-			RS_DEBUG->print("ApplicationWindow::slotRunScript: running '%s'", (*it).toLatin1().data());
+			DEBUG->print("ApplicationWindow::slotRunScript: running '%s'", (*it).toLatin1().data());
 			scripter->runScript(*it, "main");
 		}
 	}
@@ -242,7 +242,7 @@ void ApplicationWindow::slotInsertBlock()
 	if (s != NULL)
 	{
 		QString block = ((QAction *)s)->text();
-		RS_DEBUG->print("ApplicationWindow::slotInsertBlock: %s", block.toLatin1().data());
+		DEBUG->print("ApplicationWindow::slotInsertBlock: %s", block.toLatin1().data());
 		slotInsertBlock(block);
 	}
 }
@@ -252,12 +252,12 @@ void ApplicationWindow::slotInsertBlock()
  */
 void ApplicationWindow::slotInsertBlock(const QString & name)
 {
-	RS_DEBUG->print("ApplicationWindow::slotInsertBlock: '%s'", name.toLatin1().data());
+	DEBUG->print("ApplicationWindow::slotInsertBlock: '%s'", name.toLatin1().data());
 
 	statusBar()->showMessage(tr("Inserting block '%1'").arg(name), 2000);
 
 	GraphicView * graphicView = getGraphicView();
-	RS_Document * document = getDocument();
+	Document * document = getDocument();
 
 	if (graphicView && document)
 	{
@@ -314,9 +314,9 @@ void ApplicationWindow::finishSplashScreen()
  */
 void ApplicationWindow::closeEvent(QCloseEvent * /*ce*/)
 {
-	RS_DEBUG->print("ApplicationWindow::closeEvent()");
+	DEBUG->print("ApplicationWindow::closeEvent()");
 	slotFileQuit();
-	RS_DEBUG->print("ApplicationWindow::closeEvent(): OK");
+	DEBUG->print("ApplicationWindow::closeEvent(): OK");
 }
 
 /**
@@ -335,7 +335,7 @@ void ApplicationWindow::mouseReleaseEvent(QMouseEvent * e)
  */
 void ApplicationWindow::initMDI()
 {
-	RS_DEBUG->print("ApplicationWindow::initMDI() begin");
+	DEBUG->print("ApplicationWindow::initMDI() begin");
 
 /* Could use QVBoxLayout instead of Q3VBox, but do we even need to? */
 //	Q3VBox * vb = new Q3VBox(this);
@@ -345,14 +345,14 @@ void ApplicationWindow::initMDI()
 //	workspace->setScrollBarsEnabled(true);
 //	setCentralWidget(vb);
 	setCentralWidget(workspace);//JLH:hmm. (Yes, it works! \o/)
-	RS_DEBUG->print("ApplicationWindow::initMDI(): workspace=%08X", workspace);
+	DEBUG->print("ApplicationWindow::initMDI(): workspace=%08X", workspace);
 
 //#warning "Object::connect: No such signal QMdiArea::windowActivated(QWidget *)"
 //	connect(workspace, SIGNAL(windowActivated(QWidget *)), this, SLOT(slotWindowActivated(QWidget *)));
 	connect(workspace, SIGNAL(subWindowActivated(QMdiSubWindow *)), this,
 		SLOT(slotWindowActivated(QMdiSubWindow *)));
 
-	RS_DEBUG->print("ApplicationWindow::initMDI() end");
+	DEBUG->print("ApplicationWindow::initMDI() end");
 }
 
 /**
@@ -362,7 +362,7 @@ void ApplicationWindow::initMDI()
  */
 void ApplicationWindow::initActions()
 {
-	RS_DEBUG->print("ApplicationWindow::initActions()");
+	DEBUG->print("ApplicationWindow::initActions()");
 
 	//
 	// File actions:
@@ -765,6 +765,9 @@ void ApplicationWindow::initActions()
 	subMenu->addAction(actionPolylineAdd);
 	connect(actionPolylineAdd, SIGNAL(activated()), actionHandler, SLOT(slotPolylineAdd()));
 	connect(this, SIGNAL(windowsChanged(bool)), actionPolylineAdd, SLOT(setEnabled(bool)));
+	subMenu->addAction(actionPolylineAppend);
+	connect(actionPolylineAppend, SIGNAL(activated()), actionHandler, SLOT(slotPolylineAppend()));
+	connect(this, SIGNAL(windowsChanged(bool)), actionPolylineAppend, SLOT(setEnabled(bool)));
 //	action = actionFactory.createAction(RS2::ActionPolylineDel, actionHandler);
 	subMenu->addAction(actionPolylineDel);
 	connect(actionPolylineDel, SIGNAL(activated()), actionHandler, SLOT(slotPolylineDel()));
@@ -1113,7 +1116,7 @@ void ApplicationWindow::initActions()
 	addToolBar(Qt::TopToolBarArea, (QToolBar *)penToolBar); // hmm.
 	addToolBar(Qt::TopToolBarArea, optionWidget);
 
-#ifdef RS_SCRIPTING
+#ifdef SCRIPTING
 	// Scripts menu:
 	//
 	scriptMenu = new QMenu(this);
@@ -1211,7 +1214,7 @@ void ApplicationWindow::initActions()
  */
 void ApplicationWindow::initMenuBar()
 {
-	RS_DEBUG->print("ApplicationWindow::initMenuBar()");
+	DEBUG->print("ApplicationWindow::initMenuBar()");
 
 	// menuBar entry windowsMenu
 	windowsMenu = new QMenu(tr("&Window"), this);
@@ -1251,7 +1254,7 @@ void ApplicationWindow::initMenuBar()
 	testMenu->addAction(testResize1024);//testResize1024->addTo(testMenu);
 
 	// menuBar configuration
-#ifdef RS_SCRIPTING
+#ifdef SCRIPTING
 //	menuBar()->insertItem(tr("&Scripts"), scriptMenu);
 	menuBar()->addMenu(scriptMenu);
 #endif
@@ -1274,7 +1277,7 @@ void ApplicationWindow::initMenuBar()
  */
 void ApplicationWindow::initToolBar()
 {
-	RS_DEBUG->print("ApplicationWindow::initToolBar()");
+	DEBUG->print("ApplicationWindow::initToolBar()");
 
 //	fileToolBar = new Q3ToolBar(this, "File Operations");
 	fileToolBar = addToolBar(tr("File Operations"));
@@ -1285,10 +1288,10 @@ void ApplicationWindow::initToolBar()
 //	zoomToolBar = new Q3ToolBar(this, "Zoom Operations");
 	zoomToolBar = addToolBar(tr("Zoom Operations"));
 	zoomToolBar->setObjectName("zoom");
-	penToolBar = new QG_PenToolBar(this, "Pen Selection");
+	penToolBar = new PenToolBar(this, "Pen Selection");
 	penToolBar->setObjectName("pen");
 
-	connect(penToolBar, SIGNAL(penChanged(RS_Pen)), this, SLOT(slotPenChanged(RS_Pen)));
+	connect(penToolBar, SIGNAL(penChanged(Pen)), this, SLOT(slotPenChanged(Pen)));
 
 //	optionWidget = new Q3ToolBar(this, "Tool Options");
 //addToolBarBreak() does nothing...
@@ -1335,7 +1338,7 @@ void ApplicationWindow::initToolBar()
  */
 void ApplicationWindow::initStatusBar()
 {
-	RS_DEBUG->print("ApplicationWindow::initStatusBar()");
+	DEBUG->print("ApplicationWindow::initStatusBar()");
 
 	statusBar()->setMinimumHeight(32);
 	coordinateWidget = new CoordinateWidget(statusBar());//, "coordinates");
@@ -1352,7 +1355,7 @@ void ApplicationWindow::initStatusBar()
  */
 void ApplicationWindow::initSettings()
 {
-	RS_DEBUG->print("ApplicationWindow::initSettings()");
+	DEBUG->print("ApplicationWindow::initSettings()");
 	settings.beginGroup("RecentFiles");
 
 	for(int i=0; i<recentFiles->Maximum(); ++i)
@@ -1392,7 +1395,7 @@ void ApplicationWindow::initSettings()
  */
 void ApplicationWindow::storeSettings()
 {
-	RS_DEBUG->print("ApplicationWindow::storeSettings()");
+	DEBUG->print("ApplicationWindow::storeSettings()");
 
 	settings.beginGroup("RecentFiles");
 
@@ -1407,7 +1410,7 @@ void ApplicationWindow::storeSettings()
 	settings.setValue("DockWindows", saveState());
 	settings.endGroup();
 
-	RS_DEBUG->print("ApplicationWindow::storeSettings(): OK");
+	DEBUG->print("ApplicationWindow::storeSettings(): OK");
 }
 
 /**
@@ -1415,9 +1418,9 @@ void ApplicationWindow::storeSettings()
  */
 void ApplicationWindow::initView()
 {
-	RS_DEBUG->print("ApplicationWindow::initView()");
+	DEBUG->print("ApplicationWindow::initView()");
 
-	RS_DEBUG->print("init view..");
+	DEBUG->print("init view..");
 	QDockWidget * dw;
 	layerWidget = NULL;
 	blockWidget = NULL;
@@ -1428,7 +1431,7 @@ void ApplicationWindow::initView()
 #endif
 
 #ifdef RS_CAM
-	RS_DEBUG->print("  simulation widget..");
+	DEBUG->print("  simulation widget..");
 	dw = new QDockWidget(QDockWidget::InDock, this, "Simulation");
 	simulationControls = new RS_SimulationControls(dw, "Simulation");
 	simulationControls->setFocusPolicy(Qt::NoFocus);
@@ -1446,11 +1449,11 @@ void ApplicationWindow::initView()
 	//simulationDockWindow->hide();
 #endif
 
-	RS_DEBUG->print("  layer widget..");
+	DEBUG->print("  layer widget..");
 //	dw = new QDockWidget(QDockWidget::InDock, this, "Layer");
 	dw = new QDockWidget(tr("Layer List"), this);
 	dw->setObjectName("layer");
-	layerWidget = new QG_LayerWidget(actionHandler, dw, "Layer");
+	layerWidget = new LayerWidget(actionHandler, dw, "Layer");
 	layerWidget->setFocusPolicy(Qt::NoFocus);
 	connect(layerWidget, SIGNAL(escape()), this, SLOT(slotFocus()));
 	connect(this, SIGNAL(windowsChanged(bool)), layerWidget, SLOT(setEnabled(bool)));
@@ -1463,11 +1466,11 @@ void ApplicationWindow::initView()
 	addDockWidget(Qt::RightDockWidgetArea, dw);
 	layerDockWindow = dw;
 
-	RS_DEBUG->print("  block widget..");
+	DEBUG->print("  block widget..");
 //	dw = new QDockWidget(QDockWidget::InDock, this, "Block");
 	dw = new QDockWidget(tr("Block List"), this);
 	dw->setObjectName("block");
-	blockWidget = new QG_BlockWidget(actionHandler, dw, "Block");
+	blockWidget = new BlockWidget(actionHandler, dw, "Block");
 	blockWidget->setFocusPolicy(Qt::NoFocus);
 	connect(blockWidget, SIGNAL(escape()), this, SLOT(slotFocus()));
 	connect(this, SIGNAL(windowsChanged(bool)), blockWidget, SLOT(setEnabled(bool)));
@@ -1480,7 +1483,7 @@ void ApplicationWindow::initView()
 	addDockWidget(Qt::RightDockWidgetArea, dw);
 	blockDockWindow = dw;
 
-	RS_DEBUG->print("  library widget..");
+	DEBUG->print("  library widget..");
 //	dw = new QDockWidget(QDockWidget::OutsideDock, this, "Library");
 	dw = new QDockWidget(tr("Library Browser"), this);
 	dw->setObjectName("library");
@@ -1498,11 +1501,13 @@ void ApplicationWindow::initView()
 //	dw->setCaption(tr("Library Browser"));
 //not sure how to fix this one
 #warning "QMainWindow::addDockWidget: invalid 'area' argument"
-	addDockWidget(Qt::NoDockWidgetArea, dw);
+//	addDockWidget(Qt::NoDockWidgetArea, dw);
+//This works, but sux
+	addDockWidget(Qt::RightDockWidgetArea, dw);
 	libraryDockWindow = dw;
-	libraryDockWindow->hide();
+//	libraryDockWindow->hide();
 
-	RS_DEBUG->print("  command widget..");
+	DEBUG->print("  command widget..");
 //	dw = new QDockWidget(QDockWidget::InDock, this, "Command");
 	dw = new QDockWidget(tr("Command line"), this);
 	dw->setObjectName("command");
@@ -1521,7 +1526,7 @@ void ApplicationWindow::initView()
 	commandDockWindow = dw;
 	addDockWidget(Qt::BottomDockWidgetArea, dw);
 
-	RS_DEBUG->print("  done");
+	DEBUG->print("  done");
 }
 
 /**
@@ -1621,20 +1626,21 @@ void ApplicationWindow::slotFocus()
  */
 void ApplicationWindow::slotWindowActivated(QMdiSubWindow * /*w*/)
 {
-	RS_DEBUG->print("ApplicationWindow::slotWindowActivated begin");
+	DEBUG->print("ApplicationWindow::slotWindowActivated begin");
 
 //the following does: return (MDIWindow *)workspace->activeSubWindow();
 //which means the subwindow is NOT being activated!!!
 	MDIWindow * m = getMDIWindow();
-	RS_DEBUG->print(/*RS_Debug::D_CRITICAL,*/ "ApplicationWindow::slotWindowActivated m=%08X", m);
+	DEBUG->print(/*Debug::D_CRITICAL,*/ "ApplicationWindow::slotWindowActivated m=%08X", m);
+
 	if (m)
-		RS_DEBUG->print(/*RS_Debug::D_CRITICAL,*/ "ApplicationWindow::slotWindowActivated m->getDoc=%08X", m->getDocument());
+		DEBUG->print(/*Debug::D_CRITICAL,*/ "ApplicationWindow::slotWindowActivated m->getDoc=%08X", m->getDocument());
 
 	if (m && m->getDocument())
 	{
 		//m->setWindowState(WindowMaximized);
 
-		RS_DEBUG->print("ApplicationWindow::slotWindowActivated: document: %d", m->getDocument()->getId());
+		DEBUG->print("ApplicationWindow::slotWindowActivated: document: %d", m->getDocument()->getId());
 
 		bool showByBlock = m->getDocument()->rtti() == RS2::EntityBlock;
 		layerWidget->setLayerList(m->getDocument()->getLayerList(), showByBlock);
@@ -1661,7 +1667,7 @@ void ApplicationWindow::slotWindowActivated(QMdiSubWindow * /*w*/)
 		slotPenChanged(penToolBar->getPen());
 
 		// update toggle button status:
-		if (m->getGraphic() != NULL)
+		if (m->getGraphic())
 		{
 			emit(gridChanged(m->getGraphic()->isGridOn()));
 			emit(printPreviewChanged(m->getGraphicView()->isPrintPreview()));
@@ -1673,7 +1679,7 @@ void ApplicationWindow::slotWindowActivated(QMdiSubWindow * /*w*/)
 	// Disable/Enable menu and toolbar items
 	emit windowsChanged(m != NULL && m->getDocument() != NULL);
 
-	RS_DEBUG->print("ApplicationWindow::slotWindowActivated end");
+	DEBUG->print("ApplicationWindow::slotWindowActivated end");
 }
 
 /**
@@ -1682,7 +1688,7 @@ void ApplicationWindow::slotWindowActivated(QMdiSubWindow * /*w*/)
  */
 void ApplicationWindow::slotWindowsMenuAboutToShow()
 {
-	RS_DEBUG->print("ApplicationWindow::slotWindowsMenuAboutToShow");
+	DEBUG->print("ApplicationWindow::slotWindowsMenuAboutToShow");
 
 	windowsMenu->clear();
 #if 0
@@ -1739,7 +1745,7 @@ void ApplicationWindow::slotWindowsMenuAboutToShow()
  */
 void ApplicationWindow::slotWindowsMenuActivated(QAction * id)
 {
-	RS_DEBUG->print("ApplicationWindow::slotWindowsMenuActivated");
+	DEBUG->print("ApplicationWindow::slotWindowsMenuActivated");
 
 //	QMdiSubWindow * w = workspace->subWindowList().at(id);
 	QMdiSubWindow * w = workspace->subWindowList().at(id->data().toInt());
@@ -1754,7 +1760,7 @@ void ApplicationWindow::slotWindowsMenuActivated(QAction * id)
  */
 void ApplicationWindow::slotTileHorizontal()
 {
-	RS_DEBUG->print("ApplicationWindow::slotTileHorizontal");
+	DEBUG->print("ApplicationWindow::slotTileHorizontal");
 
 #if 0
 	// primitive horizontal tiling
@@ -1840,7 +1846,7 @@ void ApplicationWindow::slotTileVertical()
 void ApplicationWindow::slotCamExportAuto() {
     printf("CAM export..\n");
 
-    RS_Document* d = getDocument();
+    Document* d = getDocument();
     if (d!=NULL) {
         Drawing* graphic = (Drawing*)d;
 
@@ -1855,25 +1861,25 @@ void ApplicationWindow::slotCamExportAuto() {
  * Called when something changed in the pen tool bar
  * (e.g. color, width, style).
  */
-void ApplicationWindow::slotPenChanged(RS_Pen pen)
+void ApplicationWindow::slotPenChanged(Pen pen)
 {
-	RS_DEBUG->print("ApplicationWindow::slotPenChanged() begin");
-	RS_DEBUG->print("Setting active pen...");
+	DEBUG->print("ApplicationWindow::slotPenChanged() begin");
+	DEBUG->print("Setting active pen...");
 	MDIWindow * m = getMDIWindow();
 
 	if (m != NULL)
 		m->slotPenChanged(pen);
 
-	RS_DEBUG->print("ApplicationWindow::slotPenChanged() end");
+	DEBUG->print("ApplicationWindow::slotPenChanged() end");
 }
 
 /**
  * Creates a new MDI window with the given document or a new
  *  document if 'doc' is NULL.
  */
-MDIWindow * ApplicationWindow::slotFileNew(RS_Document * doc)
+MDIWindow * ApplicationWindow::slotFileNew(Document * doc)
 {
-	RS_DEBUG->print("ApplicationWindow::slotFileNew() begin");
+	DEBUG->print("ApplicationWindow::slotFileNew() begin");
 
 	static int id = 0;
 	id++;
@@ -1881,7 +1887,7 @@ MDIWindow * ApplicationWindow::slotFileNew(RS_Document * doc)
 	statusBar()->showMessage(tr("Creating new file..."));
 
 #warning "QWidget::setMinimumSize: (/QMdi::ControlLabel) Negative sizes (-1,-1) are not possible"
-	RS_DEBUG->print("  creating MDI window");
+	DEBUG->print("  creating MDI window");
 //	MDIWindow * w = new MDIWindow(doc, workspace, 0, Qt::WA_DeleteOnClose);
 	MDIWindow * w = new MDIWindow(doc, workspace, 0, Qt::SubWindow);
 	w->setAttribute(Qt::WA_DeleteOnClose);
@@ -1889,8 +1895,8 @@ MDIWindow * ApplicationWindow::slotFileNew(RS_Document * doc)
 	connect(w, SIGNAL(signalClosing()), this, SLOT(slotFileClosing()));
 
 	if (w->getDocument()->rtti() == RS2::EntityBlock)
-//		w->setCaption(tr("Block '%1'").arg(((RS_Block *)(w->getDocument()))->getName()));
-		w->setWindowTitle(tr("Block '%1'").arg(((RS_Block *)(w->getDocument()))->getName()));
+//		w->setCaption(tr("Block '%1'").arg(((Block *)(w->getDocument()))->getName()));
+		w->setWindowTitle(tr("Block '%1'").arg(((Block *)(w->getDocument()))->getName()));
 	else
 //		w->setCaption(tr("unnamed document %1").arg(id));
 		w->setWindowTitle(tr("unnamed document %1").arg(id));
@@ -1900,7 +1906,7 @@ MDIWindow * ApplicationWindow::slotFileNew(RS_Document * doc)
 	w->setWindowIcon(QIcon(":/res/document.png"));
 
 	// only graphics offer block lists, blocks don't
-	RS_DEBUG->print("  adding listeners");
+	DEBUG->print("  adding listeners");
 	Drawing * graphic = w->getDocument()->getGraphic();
 
 #if 0
@@ -1930,12 +1936,12 @@ MDIWindow * ApplicationWindow::slotFileNew(RS_Document * doc)
 	QG_DIALOGFACTORY->setMainWindow(this);
 
 #if 1 //bugfix for Qt3->4 conversion
-	RS_DEBUG->print(/*RS_Debug::D_CRITICAL,*/ "ApplicationWindow::slotFileNew: adding window to workspace...");
+	DEBUG->print(/*Debug::D_CRITICAL,*/ "ApplicationWindow::slotFileNew: adding window to workspace...");
 //	workspace->addWindow(w);
 	workspace->addSubWindow(w);
 #endif
 
-	RS_DEBUG->print("  showing MDI window");
+	DEBUG->print("  showing MDI window");
 
 #if 0
 #warning "w->showMaximized() doesn't seem to do anything here..."
@@ -1957,7 +1963,7 @@ MDIWindow * ApplicationWindow::slotFileNew(RS_Document * doc)
 	slotWindowActivated(w);
 	statusBar()->showMessage(tr("New Drawing created."), 2000);
 
-	RS_DEBUG->print("ApplicationWindow::slotFileNew() OK");
+	DEBUG->print("ApplicationWindow::slotFileNew() OK");
 	setFocus();
 
 	return w;
@@ -1968,15 +1974,15 @@ MDIWindow * ApplicationWindow::slotFileNew(RS_Document * doc)
  */
 void ApplicationWindow::slotFileOpen()
 {
-	RS_DEBUG->print("ApplicationWindow::slotFileOpen()");
+	DEBUG->print("ApplicationWindow::slotFileOpen()");
 
-	RS_DEBUG->print("ApplicationWindow::slotFileOpen() 001");
+	DEBUG->print("ApplicationWindow::slotFileOpen() 001");
 	RS2::FormatType type = RS2::FormatUnknown;
-	RS_DEBUG->print("ApplicationWindow::slotFileOpen() 002");
-	QString fileName = QG_FileDialog::getOpenFileName(this, &type);
-	RS_DEBUG->print("ApplicationWindow::slotFileOpen() 003");
+	DEBUG->print("ApplicationWindow::slotFileOpen() 002");
+	QString fileName = FileDialog::getOpenFileName(this, &type);
+	DEBUG->print("ApplicationWindow::slotFileOpen() 003");
 	slotFileOpen(fileName, type);
-	RS_DEBUG->print("ApplicationWindow::slotFileOpen(): OK");
+	DEBUG->print("ApplicationWindow::slotFileOpen(): OK");
 }
 
 /**
@@ -1986,7 +1992,7 @@ void ApplicationWindow::slotFileOpen()
 void ApplicationWindow::slotFileOpenRecent(void)
 {
 #if 0
-	RS_DEBUG->print("ApplicationWindow::slotFileOpenRecent()");
+	DEBUG->print("ApplicationWindow::slotFileOpenRecent()");
 
 	statusBar()->showMessage(tr("Opening recent file..."));
 	QString fileName = recentFiles->get(id);
@@ -2017,20 +2023,15 @@ void ApplicationWindow::slotFileOpenRecent(void)
  */
 void ApplicationWindow::slotFileOpen(const QString & fileName, RS2::FormatType type)
 {
-	RS_DEBUG->print("ApplicationWindow::slotFileOpen(..)");
-
+	DEBUG->print("ApplicationWindow::slotFileOpen(..)");
 	QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
 
 	if (!fileName.isEmpty())
 	{
-		RS_DEBUG->print("ApplicationWindow::slotFileOpen: creating new doc window");
+		DEBUG->print("ApplicationWindow::slotFileOpen: creating new doc window");
 		// Create new document window:
 		MDIWindow * w = slotFileNew();
-//		RS_APP->processEvents(1000);
-//Really, is this needed???
-//		RS_APP->processEvents(QEventLoop::AllEvents, 1000);
-
-		RS_DEBUG->print("ApplicationWindow::slotFileOpen: linking layer list");
+		DEBUG->print("ApplicationWindow::slotFileOpen: linking layer list");
 		// link the layer widget to the new document:
 		layerWidget->setLayerList(w->getDocument()->getLayerList(), false);
 		// link the block widget to the new document:
@@ -2041,15 +2042,10 @@ void ApplicationWindow::slotFileOpen(const QString & fileName, RS2::FormatType t
 		// link the layer widget to the new document:
 		simulationControls->setGraphicView(w->getGraphicView());
 #endif
+		DEBUG->print("ApplicationWindow::slotFileOpen: open file");
 
-		RS_DEBUG->print("ApplicationWindow::slotFileOpen: open file");
-
-//		RS_APP->processEvents(1000);
-//We no longer try to do Qt better than the Qt folks...
-//		RS_APP->processEvents(QEventLoop::AllEvents, 1000);
-
-		// open the file in the new view:
-		if (w->slotFileOpen(fileName, type) == false)
+		// Open the file in the new view:
+		if (!w->slotFileOpen(fileName, type))
 		{
 			// error
 			QApplication::restoreOverrideCursor();
@@ -2060,8 +2056,8 @@ void ApplicationWindow::slotFileOpen(const QString & fileName, RS2::FormatType t
 			return;
 		}
 
-		RS_DEBUG->print("ApplicationWindow::slotFileOpen: open file: OK");
-		RS_DEBUG->print("ApplicationWindow::slotFileOpen: update recent file menu: 1");
+		DEBUG->print("ApplicationWindow::slotFileOpen: open file: OK");
+		DEBUG->print("ApplicationWindow::slotFileOpen: update recent file menu: 1");
 
 		// update recent files menu:
 		if (type == RS2::FormatDXF1)
@@ -2069,25 +2065,21 @@ void ApplicationWindow::slotFileOpen(const QString & fileName, RS2::FormatType t
 		else
 			recentFiles->add(fileName);
 
-		RS_DEBUG->print("ApplicationWindow::slotFileOpen: update recent file menu: 2");
-//		updateRecentFilesMenu();
+		DEBUG->print("ApplicationWindow::slotFileOpen: update recent file menu: 2");
 		recentFiles->UpdateGUI();
-
-		RS_DEBUG->print("ApplicationWindow::slotFileOpen: update recent file menu: OK");
-
-		RS_DEBUG->print("ApplicationWindow::slotFileOpen: set caption");
+		DEBUG->print("ApplicationWindow::slotFileOpen: update recent file menu: OK");
+		DEBUG->print("ApplicationWindow::slotFileOpen: set caption");
 		// update caption:
-//		w->setCaption(fileName);
 		w->setWindowTitle(fileName);
-		RS_DEBUG->print("ApplicationWindow::slotFileOpen: set caption: OK");
-
-		RS_DEBUG->print("ApplicationWindow::slotFileOpen: update coordinate widget");
+		DEBUG->print("ApplicationWindow::slotFileOpen: set caption: OK");
+		DEBUG->print("ApplicationWindow::slotFileOpen: update coordinate widget");
 		// update coordinate widget format:
-		RS_DIALOGFACTORY->updateCoordinateWidget(Vector(0.0, 0.0), Vector(0.0, 0.0), true);
-		RS_DEBUG->print("ApplicationWindow::slotFileOpen: update coordinate widget: OK");
-
+		DIALOGFACTORY->updateCoordinateWidget(Vector(0.0, 0.0), Vector(0.0, 0.0), true);
+		DEBUG->print("ApplicationWindow::slotFileOpen: update coordinate widget: OK");
+		// Update the layer and block widgets (document just loaded may have some)
+		layerWidget->update();
+		blockWidget->update();
 		// show output of filter (if any):
-//		commandWidget->processStderr();
 		QString message = tr("Loaded document: ") + fileName;
 		commandWidget->appendHistory(message);
 		statusBar()->showMessage(message, 2000);
@@ -2098,7 +2090,7 @@ void ApplicationWindow::slotFileOpen(const QString & fileName, RS2::FormatType t
 	}
 
 	QApplication::restoreOverrideCursor();
-	RS_DEBUG->print("ApplicationWindow::slotFileOpen(..) OK");
+	DEBUG->print("ApplicationWindow::slotFileOpen(..) OK");
 }
 
 /**
@@ -2106,7 +2098,7 @@ void ApplicationWindow::slotFileOpen(const QString & fileName, RS2::FormatType t
  */
 void ApplicationWindow::slotFileSave()
 {
-	RS_DEBUG->print("ApplicationWindow::slotFileSave()");
+	DEBUG->print("ApplicationWindow::slotFileSave()");
 
 	statusBar()->showMessage(tr("Saving drawing..."));
 
@@ -2145,7 +2137,7 @@ void ApplicationWindow::slotFileSave()
  */
 void ApplicationWindow::slotFileSaveAs()
 {
-	RS_DEBUG->print("ApplicationWindow::slotFileSaveAs()");
+	DEBUG->print("ApplicationWindow::slotFileSaveAs()");
 
 	statusBar()->showMessage(tr("Saving drawing under new filename..."));
 
@@ -2187,18 +2179,16 @@ void ApplicationWindow::slotFileSaveAs()
  */
 void ApplicationWindow::slotFileExport()
 {
-	RS_DEBUG->print("ApplicationWindow::slotFileExport()");
-
+	DEBUG->print("ApplicationWindow::slotFileExport()");
 	statusBar()->showMessage(tr("Exporting drawing..."));
-
 	MDIWindow * w = getMDIWindow();
-	QString fn;
 
-	if (w != NULL)
+	if (w)
 	{
+		QString fn;
 		// read default settings:
 		settings.beginGroup("Paths");
-		QString defDir = settings.value("ExportImage", RS_SYSTEM->getHomeDir()).toString();
+		QString defDir = settings.value("ExportImage", SYSTEM->getHomeDir()).toString();
 		QString defFilter = settings.value("ExportImageFilter", "Portable Network Graphic (*.png)").toString();
 		settings.endGroup();
 
@@ -2323,17 +2313,17 @@ bool ApplicationWindow::slotFileExport(const QString & name, const QString & for
 {
 	MDIWindow * w = getMDIWindow();
 
-	if (w == NULL)
+	if (!w)
 	{
-		RS_DEBUG->print(RS_Debug::D_WARNING, "ApplicationWindow::slotFileExport: no window opened");
+		DEBUG->print(Debug::D_WARNING, "ApplicationWindow::slotFileExport: no window opened");
 		return false;
 	}
 
 	Drawing * graphic = w->getDocument()->getGraphic();
 
-	if (graphic == NULL)
+	if (!graphic)
 	{
-		RS_DEBUG->print(RS_Debug::D_WARNING, "ApplicationWindow::slotFileExport: no graphic");
+		DEBUG->print(Debug::D_WARNING, "ApplicationWindow::slotFileExport: no graphic");
 		return false;
 	}
 
@@ -2348,13 +2338,13 @@ bool ApplicationWindow::slotFileExport(const QString & name, const QString & for
 
 	// black background:
 	if (black)
-//		painter->setBackgroundColor(RS_Color(0, 0, 0));
-//		qpntr.setBackgroundColor(RS_Color(0, 0, 0));
+//		painter->setBackgroundColor(Color(0, 0, 0));
+//		qpntr.setBackgroundColor(Color(0, 0, 0));
 		qpntr.setBackground(QBrush(QColor(0, 0, 0)));
 	// white background:
 	else
-//		painter->setBackgroundColor(RS_Color(255, 255, 255));
-//		qpntr.setBackgroundColor(RS_Color(255, 255, 255));
+//		painter->setBackgroundColor(Color(255, 255, 255));
+//		qpntr.setBackgroundColor(Color(255, 255, 255));
 		qpntr.setBackground(QBrush(QColor(255, 255, 255)));
 
 	// black/white:
@@ -2364,12 +2354,12 @@ bool ApplicationWindow::slotFileExport(const QString & name, const QString & for
 //	painter->eraseRect(0, 0, size.width(), size.height());
 	qpntr.eraseRect(0, 0, size.width(), size.height());
 
-	RS_StaticGraphicView gv(size.width(), size.height(), painter);
+	StaticGraphicView gv(size.width(), size.height(), painter);
 
 	if (black)
-		gv.setBackground(RS_Color(0, 0, 0));
+		gv.setBackground(Color(0, 0, 0));
 	else
-		gv.setBackground(RS_Color(255, 255, 255));
+		gv.setBackground(Color(255, 255, 255));
 
 	gv.setContainer(graphic);
 	gv.zoomAuto(false);
@@ -2388,7 +2378,7 @@ bool ApplicationWindow::slotFileExport(const QString & name, const QString & for
 		ret = true;
 	}
 #else
-#warning "Need to port to Qt4... !!! FIX !!!"
+#warning "ApplicationWindow::slotFileExport(): Need to port to Qt4... !!! FIX !!!"
 #endif
 
 	QApplication::restoreOverrideCursor();
@@ -2412,11 +2402,11 @@ bool ApplicationWindow::slotFileExport(const QString & name, const QString & for
  */
 void ApplicationWindow::slotFileClose()
 {
-	RS_DEBUG->print("ApplicationWindow::slotFileClose()");
+	DEBUG->print("ApplicationWindow::slotFileClose()");
 
 	MDIWindow * m = getMDIWindow();
 
-	if (m != NULL)
+	if (m)
 //		m->close(true);
 		m->close();
 
@@ -2435,9 +2425,9 @@ void ApplicationWindow::slotFileClose()
  */
 void ApplicationWindow::slotFileClosing()
 {
-	RS_DEBUG->print("ApplicationWindow::slotFileClosing()");
+	DEBUG->print("ApplicationWindow::slotFileClosing()");
 
-	RS_DEBUG->print("detaching lists");
+	DEBUG->print("detaching lists");
 	layerWidget->setLayerList(NULL, false);
 	blockWidget->setBlockList(NULL);
 	coordinateWidget->setGraphic(NULL);
@@ -2451,13 +2441,13 @@ void ApplicationWindow::slotFileClosing()
  */
 void ApplicationWindow::slotFilePrint()
 {
-	RS_DEBUG->print("ApplicationWindow::slotFilePrint()");
+	DEBUG->print("ApplicationWindow::slotFilePrint()");
 
 	MDIWindow * w = getMDIWindow();
 
 	if (w == NULL)
 	{
-		RS_DEBUG->print(RS_Debug::D_WARNING, "ApplicationWindow::slotFilePrint: no window opened");
+		DEBUG->print(Debug::D_WARNING, "ApplicationWindow::slotFilePrint: no window opened");
 		return;
 	}
 
@@ -2465,7 +2455,7 @@ void ApplicationWindow::slotFilePrint()
 
 	if (graphic == NULL)
 	{
-		RS_DEBUG->print(RS_Debug::D_WARNING, "ApplicationWindow::slotFilePrint: no graphic");
+		DEBUG->print(Debug::D_WARNING, "ApplicationWindow::slotFilePrint: no graphic");
 		return;
 	}
 
@@ -2489,6 +2479,7 @@ void ApplicationWindow::slotFilePrint()
 	// printer setup:
 //	if (printer->setup(this))
 	QPrintDialog dialog(printer, this);
+
 	if (dialog.exec())
 	{
 		//printer->setOutputToFile(true);
@@ -2504,15 +2495,15 @@ void ApplicationWindow::slotFilePrint()
 		PaintInterface * painter = new PaintInterface(&qpntr);
 		painter->setDrawingMode(w->getGraphicView()->getDrawingMode());
 
-//		RS_StaticGraphicView gv(metr.width(), metr.height(), painter);
-		RS_StaticGraphicView gv(printer->width(), printer->height(), painter);
+//		StaticGraphicView gv(metr.width(), metr.height(), painter);
+		StaticGraphicView gv(printer->width(), printer->height(), painter);
 		gv.setPrinting(true);
 		gv.setBorders(0, 0, 0, 0);
 
-//		double fx = (double)metr.width() / metr.widthMM() * RS_Units::getFactorToMM(graphic->getUnit());
-//		double fy = (double)metr.height() / metr.heightMM() * RS_Units::getFactorToMM(graphic->getUnit());
-		double fx = (double)printer->width() / printer->widthMM() * RS_Units::getFactorToMM(graphic->getUnit());
-		double fy = (double)printer->height() / printer->heightMM() * RS_Units::getFactorToMM(graphic->getUnit());
+//		double fx = (double)metr.width() / metr.widthMM() * Units::getFactorToMM(graphic->getUnit());
+//		double fy = (double)metr.height() / metr.heightMM() * Units::getFactorToMM(graphic->getUnit());
+		double fx = (double)printer->width() / printer->widthMM() * Units::getFactorToMM(graphic->getUnit());
+		double fy = (double)printer->height() / printer->heightMM() * Units::getFactorToMM(graphic->getUnit());
 		double f = (fx + fy) / 2;
 		double scale = graphic->getPaperScale();
 
@@ -2546,25 +2537,25 @@ void ApplicationWindow::slotFilePrint()
  */
 void ApplicationWindow::slotFilePrintPreview(bool on)
 {
-	RS_DEBUG->print("ApplicationWindow::slotFilePrintPreview()");
+	DEBUG->print("ApplicationWindow::slotFilePrintPreview()");
 
-	RS_DEBUG->print("  creating MDI window");
+	DEBUG->print("  creating MDI window");
 	MDIWindow * parent = getMDIWindow();
 
-	if (parent == NULL)
+	if (!parent)
 	{
-		RS_DEBUG->print(RS_Debug::D_WARNING, "ApplicationWindow::slotFilePrintPreview: no window opened");
+		DEBUG->print(Debug::D_WARNING, "ApplicationWindow::slotFilePrintPreview: no window opened");
 		return;
 	}
 
 	// close print preview:
 	if (!on)
 	{
-		RS_DEBUG->print("ApplicationWindow::slotFilePrintPreview(): off");
+		DEBUG->print("ApplicationWindow::slotFilePrintPreview(): off");
 
 		if (parent->getGraphicView()->isPrintPreview())
 		{
-			RS_DEBUG->print("ApplicationWindow::slotFilePrintPreview(): close");
+			DEBUG->print("ApplicationWindow::slotFilePrintPreview(): close");
 			slotFileClose();
 		}
 	}
@@ -2576,7 +2567,7 @@ void ApplicationWindow::slotFilePrintPreview(bool on)
 
 		if (ppv != NULL)
 		{
-			RS_DEBUG->print("ApplicationWindow::slotFilePrintPreview(): show existing");
+			DEBUG->print("ApplicationWindow::slotFilePrintPreview(): show existing");
 			slotWindowActivated(ppv);
 			ppv->showNormal();
 		}
@@ -2584,7 +2575,7 @@ void ApplicationWindow::slotFilePrintPreview(bool on)
 		{
 			if (!parent->getGraphicView()->isPrintPreview())
 			{
-				RS_DEBUG->print("ApplicationWindow::slotFilePrintPreview(): create");
+				DEBUG->print("ApplicationWindow::slotFilePrintPreview(): create");
 
 				MDIWindow * w = new MDIWindow(parent->getDocument(), workspace, 0, Qt::SubWindow);
 				w->setAttribute(Qt::WA_DeleteOnClose);
@@ -2598,11 +2589,11 @@ void ApplicationWindow::slotFilePrintPreview(bool on)
 //				w->setWindowIcon(qPixmapFromMimeSource("document.png"));
 				w->setWindowIcon(QIcon(":/res/document.png"));
 				w->getGraphicView()->setPrintPreview(true);
-				w->getGraphicView()->setBackground(RS_Color(255, 255, 255));
+				w->getGraphicView()->setBackground(Color(255, 255, 255));
 				w->getGraphicView()->setDefaultAction(new ActionPrintPreview(*w->getDocument(), *w->getGraphicView()));
 
 				// only graphics offer block lists, blocks don't
-				RS_DEBUG->print("  adding listeners");
+				DEBUG->print("  adding listeners");
 				Drawing * graphic = w->getDocument()->getGraphic();
 
 				if (graphic)
@@ -2631,7 +2622,7 @@ void ApplicationWindow::slotFilePrintPreview(bool on)
 				// Link the graphic view to the command widget:
 				QG_DIALOGFACTORY->setCommandWidget(commandWidget);
 
-				RS_DEBUG->print("  showing MDI window");
+				DEBUG->print("  showing MDI window");
 
 				if (workspace->subWindowList().isEmpty())
 					w->showMaximized();
@@ -2652,7 +2643,7 @@ void ApplicationWindow::slotFilePrintPreview(bool on)
  */
 void ApplicationWindow::slotFileQuit()
 {
-	RS_DEBUG->print("ApplicationWindow::slotFileQuit()");
+	DEBUG->print("ApplicationWindow::slotFileQuit()");
 
 	statusBar()->showMessage(tr("Exiting application..."));
 
@@ -2660,6 +2651,7 @@ void ApplicationWindow::slotFileQuit()
 		qApp->exit(0);
 }
 
+#if 0
 /**
  * Forces termination of QCad (demo version).
  */
@@ -2670,6 +2662,7 @@ void ApplicationWindow::slotFileDemoQuit()
 	queryExit(true);
 	qApp->exit(0);
 }
+#endif
 
 /**
  * Shows / hides the grid.
@@ -2678,7 +2671,7 @@ void ApplicationWindow::slotFileDemoQuit()
  */
 void ApplicationWindow::slotViewGrid(bool toggle)
 {
-	RS_DEBUG->print("ApplicationWindow::slotViewGrid()");
+	DEBUG->print("ApplicationWindow::slotViewGrid()");
 
 	MDIWindow * m = getMDIWindow();
 
@@ -2693,7 +2686,7 @@ void ApplicationWindow::slotViewGrid(bool toggle)
 	updateGrids();
 	redrawAll();
 
-	RS_DEBUG->print("ApplicationWindow::slotViewGrid() OK");
+	DEBUG->print("ApplicationWindow::slotViewGrid() OK");
 }
 
 /**
@@ -2703,7 +2696,7 @@ void ApplicationWindow::slotViewGrid(bool toggle)
  */
 void ApplicationWindow::slotViewDraft(bool toggle)
 {
-	RS_DEBUG->print("ApplicationWindow::slotViewDraft()");
+	DEBUG->print("ApplicationWindow::slotViewDraft()");
 
     /*MDIWindow* m = getMDIWindow();
     if (m!=NULL) {
@@ -2775,7 +2768,7 @@ void ApplicationWindow::updateGrids()
  */
 void ApplicationWindow::slotViewStatusBar(bool showSB)
 {
-	RS_DEBUG->print("ApplicationWindow::slotViewStatusBar()");
+	DEBUG->print("ApplicationWindow::slotViewStatusBar()");
 
 	if (showSB)
 		statusBar()->show();
@@ -2789,7 +2782,7 @@ void ApplicationWindow::slotViewStatusBar(bool showSB)
  * @param toggle true: show, false: hide.
  */
 /*void ApplicationWindow::slotViewLayerList(bool toggle) {
-    RS_DEBUG->print("ApplicationWindow::slotViewLayerList()");
+    DEBUG->print("ApplicationWindow::slotViewLayerList()");
 
     if (toggle==false) {
         layerDockWindow->hide();
@@ -2806,7 +2799,7 @@ void ApplicationWindow::slotViewStatusBar(bool showSB)
  */
 /*
 void ApplicationWindow::slotViewBlockList(bool toggle) {
-    RS_DEBUG->print("ApplicationWindow::slotViewBlockList()");
+    DEBUG->print("ApplicationWindow::slotViewBlockList()");
 
     if (toggle==false) {
         blockDockWindow->hide();
@@ -2823,7 +2816,7 @@ void ApplicationWindow::slotViewBlockList(bool toggle) {
  */
 /*
 void ApplicationWindow::slotViewCommandLine(bool toggle) {
-    RS_DEBUG->print("ApplicationWindow::slotViewCommandLine()");
+    DEBUG->print("ApplicationWindow::slotViewCommandLine()");
 
     if (toggle==false) {
         commandDockWindow->hide();
@@ -2845,7 +2838,7 @@ void ApplicationWindow::slotViewCommandLine(bool toggle) {
  */
 /*
 void ApplicationWindow::slotViewOptionToolbar(bool toggle) {
-    RS_DEBUG->print("ApplicationWindow::slotViewOptionToolbar()");
+    DEBUG->print("ApplicationWindow::slotViewOptionToolbar()");
 
     if (toggle==false) {
         optionWidget->hide();
@@ -2860,13 +2853,13 @@ void ApplicationWindow::slotViewOptionToolbar(bool toggle) {
  */
 /*
 void ApplicationWindow::slotBlocksEdit() {
-    RS_DEBUG->print("ApplicationWindow::slotBlocksEdit()");
+    DEBUG->print("ApplicationWindow::slotBlocksEdit()");
 
     MDIWindow* parent = getMDIWindow();
     if (parent!=NULL) {
-        RS_BlockList* blist = blockWidget->getBlockList();
+        BlockList* blist = blockWidget->getBlockList();
         if (blist!=NULL) {
-            RS_Block* blk = blist->getActiveBlock();
+            Block* blk = blist->getActiveBlock();
             if (blk!=NULL) {
                 MDIWindow* w = slotFileNew(blk);
                 // the parent needs a pointer to the block window and
@@ -2884,7 +2877,7 @@ void ApplicationWindow::slotBlocksEdit() {
  */
 void ApplicationWindow::slotOptionsGeneral()
 {
-	RS_DIALOGFACTORY->requestOptionsGeneralDialog();
+	DIALOGFACTORY->requestOptionsGeneralDialog();
 
 	// update background color of all open drawings:
 	settings.beginGroup("Appearance");
@@ -2924,7 +2917,7 @@ void ApplicationWindow::slotOptionsGeneral()
  */
 void ApplicationWindow::slotScriptOpenIDE()
 {
-#ifdef RS_SCRIPTING
+#ifdef SCRIPTING
 	scripter->openIDE();
 #endif
 }
@@ -2934,7 +2927,7 @@ void ApplicationWindow::slotScriptOpenIDE()
  */
 void ApplicationWindow::slotScriptRun()
 {
-#ifdef RS_SCRIPTING
+#ifdef SCRIPTING
 	scripter->runScript();
 #endif
 }
@@ -2944,20 +2937,20 @@ void ApplicationWindow::slotScriptRun()
  */
 void ApplicationWindow::slotHelpAbout()
 {
-	RS_DEBUG->print("ApplicationWindow::slotHelpAbout()");
+	DEBUG->print("ApplicationWindow::slotHelpAbout()");
 	QStringList modules;
 
 #ifdef RS_CAM
 	modules += "CAM";
 #endif
 
-#ifdef RS_SCRIPTING
+#ifdef SCRIPTING
 	modules += "Scripting";
 #endif
 
 	QString modulesString;
 
-	if (modules.empty() == false)
+	if (!modules.empty())
 		modulesString = modules.join(", ");
 	else
 		modulesString = tr("None");
@@ -2975,6 +2968,8 @@ void ApplicationWindow::slotHelpAbout()
 		tr("Version: %1").arg("1.0.0") + "<br>" +
 		tr("Date: %1").arg(__DATE__) + "<br>" +
 		QString("&copy; 2010 Underground Software,<br>James Hammons") +
+		"<br>" +
+		QString("Portions &copy; 2001-2003 RibbonSoft") +
 		"<br>"
 #ifdef QC_ABOUT_ADD_COMPANY
 		+ QString("<br>") + QC_ABOUT_ADD_COMPANY
@@ -2997,17 +2992,17 @@ void ApplicationWindow::slotHelpManual()
 {
 #warning "No help system ported to Qt4... !!! FIX !!!"
 #if 0
-    RS_DEBUG->print("ApplicationWindow::slotHelpManual()");
+    DEBUG->print("ApplicationWindow::slotHelpManual()");
 
     if (assistant == NULL)
 	{
-        RS_DEBUG->print("ApplicationWindow::slotHelpManual(): appdir: %s", RS_SYSTEM->getAppDir().toLatin1().data());
-        RS_DEBUG->print("ApplicationWindow::slotHelpManual(): appdir: %s", RS_SYSTEM->getAppDir().toLatin1().data());
-        assistant = new QAssistantClient(RS_SYSTEM->getAppDir()+"/bin", this);
+        DEBUG->print("ApplicationWindow::slotHelpManual(): appdir: %s", SYSTEM->getAppDir().toLatin1().data());
+        DEBUG->print("ApplicationWindow::slotHelpManual(): appdir: %s", SYSTEM->getAppDir().toLatin1().data());
+        assistant = new QAssistantClient(SYSTEM->getAppDir()+"/bin", this);
 		connect(assistant, SIGNAL(error(const QString&)), this, SLOT(slotError(const QString&)));
         QStringList args;
         args << "-profile";
-        args << QDir::convertSeparators(RS_SYSTEM->getDocPath() + "/qcaddoc.adp");
+        args << QDir::convertSeparators(SYSTEM->getDocPath() + "/qcaddoc.adp");
 //        args << QString("doc") + QDir::separator() + QString("qcaddoc.adp");
 
 #if QT_VERSION>=0x030200
@@ -3022,9 +3017,9 @@ void ApplicationWindow::slotHelpManual()
 /**
  * Testing function.
  */
-void ApplicationWindow::slotTestDumpEntities(RS_EntityContainer * d)
+void ApplicationWindow::slotTestDumpEntities(EntityContainer * d)
 {
-	RS_DEBUG->print("ApplicationWindow::slotTestDumpEntities()");
+	DEBUG->print("ApplicationWindow::slotTestDumpEntities()");
 	static int level = 0;
 	std::ofstream dumpFile;
 
@@ -3048,7 +3043,7 @@ void ApplicationWindow::slotTestDumpEntities(RS_EntityContainer * d)
 			dumpFile << "<body>\n";
 		}
 
-		for (RS_Entity* e=d->firstEntity();
+		for (Entity* e=d->firstEntity();
 				e!=NULL;
 				e=d->nextEntity())
 		{
@@ -3080,7 +3075,7 @@ void ApplicationWindow::slotTestDumpEntities(RS_EntityContainer * d)
 			{
 			case RS2::EntityPoint:
 			{
-					RS_Point* p = (RS_Point*)e;
+					Point* p = (Point*)e;
 					dumpFile
 					<< "<table><tr><td>"
 					<< "<b>Point:</b>"
@@ -3096,7 +3091,7 @@ void ApplicationWindow::slotTestDumpEntities(RS_EntityContainer * d)
 
 			case RS2::EntityLine:
 			{
-					RS_Line* l = (RS_Line*)e;
+					Line* l = (Line*)e;
 					dumpFile
 					<< "<table><tr><td>"
 					<< "<b>Line:</b>"
@@ -3114,7 +3109,7 @@ void ApplicationWindow::slotTestDumpEntities(RS_EntityContainer * d)
 				break;
 
 			case RS2::EntityArc: {
-					RS_Arc* a = (RS_Arc*)e;
+					Arc* a = (Arc*)e;
 					dumpFile
 					<< "<table><tr><td>"
 					<< "<b>Arc:</b>"
@@ -3147,7 +3142,7 @@ void ApplicationWindow::slotTestDumpEntities(RS_EntityContainer * d)
 				break;
 
 			case RS2::EntityCircle: {
-					RS_Circle* c = (RS_Circle*)e;
+					Circle* c = (Circle*)e;
 					dumpFile
 					<< "<table><tr><td>"
 					<< "<b>Circle:</b>"
@@ -3165,7 +3160,7 @@ void ApplicationWindow::slotTestDumpEntities(RS_EntityContainer * d)
 				break;
 
 			case RS2::EntityDimAligned: {
-					RS_DimAligned* d = (RS_DimAligned*)e;
+					DimAligned* d = (DimAligned*)e;
 					dumpFile
 					<< "<table><tr><td>"
 					<< "<b>Dimension / Aligned:</b>"
@@ -3193,7 +3188,7 @@ void ApplicationWindow::slotTestDumpEntities(RS_EntityContainer * d)
 
 			case RS2::EntityDimLinear:
 			{
-					RS_DimLinear* d = (RS_DimLinear*)e;
+					DimLinear* d = (DimLinear*)e;
 					dumpFile
 					<< "<table><tr><td>"
 					<< "<b>Dimension / Linear:</b>"
@@ -3220,7 +3215,7 @@ void ApplicationWindow::slotTestDumpEntities(RS_EntityContainer * d)
 				break;
 
 			case RS2::EntityInsert: {
-					RS_Insert* i = (RS_Insert*)e;
+					Insert* i = (Insert*)e;
 					dumpFile
 					<< "<table><tr><td>"
 					<< "<b>Insert:</b>"
@@ -3235,7 +3230,7 @@ void ApplicationWindow::slotTestDumpEntities(RS_EntityContainer * d)
 				break;
 
 			case RS2::EntityText: {
-					RS_Text* t = (RS_Text*)e;
+					Text* t = (Text*)e;
 					dumpFile
 					<< "<table><tr><td>"
 					<< "<b>Text:</b>"
@@ -3253,7 +3248,7 @@ void ApplicationWindow::slotTestDumpEntities(RS_EntityContainer * d)
 				break;
 
 			case RS2::EntityHatch: {
-					RS_Hatch* h = (RS_Hatch*)e;
+					Hatch* h = (Hatch*)e;
 					dumpFile
 					<< "<table><tr><td>"
 					<< "<b>Hatch:</b>"
@@ -3282,7 +3277,7 @@ void ApplicationWindow::slotTestDumpEntities(RS_EntityContainer * d)
 			}
 
 			if (e->isContainer() || e->rtti()==RS2::EntityHatch) {
-				RS_EntityContainer* ec = (RS_EntityContainer*)e;
+				EntityContainer* ec = (EntityContainer*)e;
 				dumpFile << "<table><tr><td valign=\"top\">&nbsp;&nbsp;&nbsp;&nbsp;Contents:</td><td>\n";
 				dumpFile.close();
 				slotTestDumpEntities(ec);
@@ -3310,13 +3305,13 @@ void ApplicationWindow::slotTestDumpEntities(RS_EntityContainer * d)
  */
 void ApplicationWindow::slotTestDumpUndo()
 {
-	RS_DEBUG->print("ApplicationWindow::slotTestDumpUndo()");
+	DEBUG->print("ApplicationWindow::slotTestDumpUndo()");
 
-	RS_Document * d = getDocument();
+	Document * d = getDocument();
 
 	if (d != NULL)
 	{
-		std::cout << *(RS_Undo*)d;
+		std::cout << *(Undo*)d;
 		std::cout << std::endl;
 	}
 }
@@ -3326,9 +3321,9 @@ void ApplicationWindow::slotTestDumpUndo()
  */
 void ApplicationWindow::slotTestUpdateInserts()
 {
-	RS_DEBUG->print("ApplicationWindow::slotTestUpdateInserts()");
+	DEBUG->print("ApplicationWindow::slotTestUpdateInserts()");
 
-	RS_Document * d = getDocument();
+	Document * d = getDocument();
 
 	if (d != NULL)
 		d->updateInserts();
@@ -3339,7 +3334,7 @@ void ApplicationWindow::slotTestUpdateInserts()
  */
 void ApplicationWindow::slotTestDrawFreehand()
 {
-	RS_DEBUG->print("ApplicationWindow::slotTestDrawFreehand()");
+	DEBUG->print("ApplicationWindow::slotTestDrawFreehand()");
 
     //Drawing* g = document->getMarking();
     /*
@@ -3396,9 +3391,9 @@ void ApplicationWindow::slotTestDrawFreehand()
  */
 void ApplicationWindow::slotTestInsertBlock()
 {
-	RS_DEBUG->print("ApplicationWindow::slotTestInsertBlock()");
+	DEBUG->print("ApplicationWindow::slotTestInsertBlock()");
 
-	RS_Document * d = getDocument();
+	Document * d = getDocument();
 
 	if (d != NULL && d->rtti() == RS2::EntityGraphic)
 	{
@@ -3407,81 +3402,81 @@ void ApplicationWindow::slotTestInsertBlock()
 		if (graphic == NULL)
 			return;
 
-		graphic->addLayer(new RS_Layer("default"));
-		RS_Block * block = new RS_Block(graphic, RS_BlockData("debugblock", Vector(0.0, 0.0), true));
+		graphic->addLayer(new Layer("default"));
+		Block * block = new Block(graphic, BlockData("debugblock", Vector(0.0, 0.0), true));
 
-		RS_Line * line;
-		RS_Arc * arc;
-		RS_Circle * circle;
+		Line * line;
+		Arc * arc;
+		Circle * circle;
 
 		// Add one red line:
-		line = new RS_Line(block, RS_LineData(Vector(0.0, 0.0), Vector(50.0, 0.0)));
+		line = new Line(block, LineData(Vector(0.0, 0.0), Vector(50.0, 0.0)));
 		line->setLayerToActive();
-		line->setPen(RS_Pen(RS_Color(255, 0, 0), RS2::Width01, RS2::SolidLine));
+		line->setPen(Pen(Color(255, 0, 0), RS2::Width01, RS2::SolidLine));
 		block->addEntity(line);
 
 		// Add one line with attributes from block:
-		line = new RS_Line(block, RS_LineData(Vector(50.0, 0.0), Vector(50.0, 50.0)));
-		line->setPen(RS_Pen(RS_Color(RS2::FlagByBlock), RS2::WidthByBlock, RS2::LineByBlock));
+		line = new Line(block, LineData(Vector(50.0, 0.0), Vector(50.0, 50.0)));
+		line->setPen(Pen(Color(RS2::FlagByBlock), RS2::WidthByBlock, RS2::LineByBlock));
 		block->addEntity(line);
 
 		// Add one arc with attributes from block:
-		RS_ArcData d(Vector(50.0, 0.0), 50.0, M_PI / 2.0, M_PI, false);
-		arc = new RS_Arc(block, d);
-		arc->setPen(RS_Pen(RS_Color(RS2::FlagByBlock), RS2::WidthByBlock, RS2::LineByBlock));
+		ArcData d(Vector(50.0, 0.0), 50.0, M_PI / 2.0, M_PI, false);
+		arc = new Arc(block, d);
+		arc->setPen(Pen(Color(RS2::FlagByBlock), RS2::WidthByBlock, RS2::LineByBlock));
 		block->addEntity(arc);
 
 		// Add one blue circle:
-		RS_CircleData circleData(Vector(20.0, 15.0), 12.5);
-		circle = new RS_Circle(block, circleData);
+		CircleData circleData(Vector(20.0, 15.0), 12.5);
+		circle = new Circle(block, circleData);
 		circle->setLayerToActive();
-		circle->setPen(RS_Pen(RS_Color(0, 0, 255), RS2::Width01, RS2::SolidLine));
+		circle->setPen(Pen(Color(0, 0, 255), RS2::Width01, RS2::SolidLine));
 		block->addEntity(circle);
 
 		graphic->addBlock(block);
 
-		RS_Insert * ins;
-		RS_InsertData insData("debugblock", Vector(0.0, 0.0), Vector(1.0, 1.0), 0.0, 1, 1, Vector(0.0, 0.0), NULL, RS2::NoUpdate);
+		Insert * ins;
+		InsertData insData("debugblock", Vector(0.0, 0.0), Vector(1.0, 1.0), 0.0, 1, 1, Vector(0.0, 0.0), NULL, RS2::NoUpdate);
 
 		// insert one magenta instance of the block (original):
-		ins = new RS_Insert(graphic, insData);
+		ins = new Insert(graphic, insData);
 		ins->setLayerToActive();
-		ins->setPen(RS_Pen(RS_Color(255, 0, 255), RS2::Width02, RS2::SolidLine));
+		ins->setPen(Pen(Color(255, 0, 255), RS2::Width02, RS2::SolidLine));
 		ins->update();
 		graphic->addEntity(ins);
 
 		// insert one green instance of the block (rotate):
-		insData = RS_InsertData("debugblock", Vector(-50.0, 20.0), Vector(1.0, 1.0), 30.0 / ARAD, 1, 1, Vector(0.0, 0.0), NULL, RS2::NoUpdate);
-		ins = new RS_Insert(graphic, insData);
+		insData = InsertData("debugblock", Vector(-50.0, 20.0), Vector(1.0, 1.0), 30.0 / ARAD, 1, 1, Vector(0.0, 0.0), NULL, RS2::NoUpdate);
+		ins = new Insert(graphic, insData);
 		ins->setLayerToActive();
-		ins->setPen(RS_Pen(RS_Color(0, 255, 0), RS2::Width02, RS2::SolidLine));
+		ins->setPen(Pen(Color(0, 255, 0), RS2::Width02, RS2::SolidLine));
 		ins->update();
 		graphic->addEntity(ins);
 
 		// insert one cyan instance of the block (move):
-		insData = RS_InsertData("debugblock", Vector(10.0, 20.0), Vector(1.0, 1.0), 0.0, 1, 1, Vector(0.0, 0.0), NULL, RS2::NoUpdate);
-		ins = new RS_Insert(graphic, insData);
+		insData = InsertData("debugblock", Vector(10.0, 20.0), Vector(1.0, 1.0), 0.0, 1, 1, Vector(0.0, 0.0), NULL, RS2::NoUpdate);
+		ins = new Insert(graphic, insData);
 		ins->setLayerToActive();
-		ins->setPen(RS_Pen(RS_Color(0, 255, 255), RS2::Width02, RS2::SolidLine));
+		ins->setPen(Pen(Color(0, 255, 255), RS2::Width02, RS2::SolidLine));
 		ins->update();
 		graphic->addEntity(ins);
 
 		// insert one blue instance of the block:
 		for(double a=0.0; a<360.0; a+=45.0)
 		{
-			insData = RS_InsertData("debugblock", Vector(60.0, 0.0), Vector(2.0 / 5, 2.0 / 5), a/ARAD, 1, 1, Vector(0.0, 0.0), NULL, RS2::NoUpdate);
-			ins = new RS_Insert(graphic, insData);
+			insData = InsertData("debugblock", Vector(60.0, 0.0), Vector(2.0 / 5, 2.0 / 5), a/ARAD, 1, 1, Vector(0.0, 0.0), NULL, RS2::NoUpdate);
+			ins = new Insert(graphic, insData);
 			ins->setLayerToActive();
-			ins->setPen(RS_Pen(RS_Color(0, 0, 255), RS2::Width05, RS2::SolidLine));
+			ins->setPen(Pen(Color(0, 0, 255), RS2::Width05, RS2::SolidLine));
 			ins->update();
 			graphic->addEntity(ins);
 		}
 
 		// insert an array of yellow instances of the block:
-		insData = RS_InsertData("debugblock", Vector(-100.0, -100.0), Vector(0.2, 0.2), M_PI / 6.0, 6, 4, Vector(100.0, 100.0), NULL, RS2::NoUpdate);
-		ins = new RS_Insert(graphic, insData);
+		insData = InsertData("debugblock", Vector(-100.0, -100.0), Vector(0.2, 0.2), M_PI / 6.0, 6, 4, Vector(100.0, 100.0), NULL, RS2::NoUpdate);
+		ins = new Insert(graphic, insData);
 		ins->setLayerToActive();
-		ins->setPen(RS_Pen(RS_Color(255, 255, 0), RS2::Width01, RS2::SolidLine));
+		ins->setPen(Pen(Color(255, 255, 0), RS2::Width01, RS2::SolidLine));
 		ins->update();
 		graphic->addEntity(ins);
 
@@ -3497,9 +3492,9 @@ void ApplicationWindow::slotTestInsertBlock()
  */
 void ApplicationWindow::slotTestInsertEllipse()
 {
-	RS_DEBUG->print("ApplicationWindow::slotTestInsertEllipse()");
+	DEBUG->print("ApplicationWindow::slotTestInsertEllipse()");
 
-	RS_Document * d = getDocument();
+	Document * d = getDocument();
 
 	if (d != NULL)
 	{
@@ -3508,8 +3503,8 @@ void ApplicationWindow::slotTestInsertEllipse()
 		if (graphic == NULL)
 			return;
 
-		RS_Ellipse * ellipse;
-		RS_Line * line;
+		Ellipse * ellipse;
+		Line * line;
 
 		for (double a=0.0; a<2*M_PI; a+=0.1)
 		{
@@ -3517,39 +3512,39 @@ void ApplicationWindow::slotTestInsertEllipse()
 			v.setPolar(50.0, a);
 			double xp = 1000.0*a;
 
-			RS_EllipseData ellipseData(Vector(xp, 0.0), v, 0.5, 0.0, 2 * M_PI, false);
-			ellipse = new RS_Ellipse(graphic, ellipseData);
+			EllipseData ellipseData(Vector(xp, 0.0), v, 0.5, 0.0, 2 * M_PI, false);
+			ellipse = new Ellipse(graphic, ellipseData);
 
-			ellipse->setPen(RS_Pen(RS_Color(255, 0, 255), RS2::Width01, RS2::SolidLine));
+			ellipse->setPen(Pen(Color(255, 0, 255), RS2::Width01, RS2::SolidLine));
 
 			graphic->addEntity(ellipse);
-			//graphic->addEntity(new RS_Point(graphic, ellipse->getMax()));
-			//graphic->addEntity(new RS_Point(graphic, ellipse->getMin()));
+			//graphic->addEntity(new Point(graphic, ellipse->getMax()));
+			//graphic->addEntity(new Point(graphic, ellipse->getMin()));
 
-			line = new RS_Line(graphic, RS_LineData(Vector(xp, 0.0), Vector(xp, 0.0) + v));
-			line->setPen(RS_Pen(RS_Color(128, 128, 128), RS2::Width01, RS2::SolidLine));
+			line = new Line(graphic, LineData(Vector(xp, 0.0), Vector(xp, 0.0) + v));
+			line->setPen(Pen(Color(128, 128, 128), RS2::Width01, RS2::SolidLine));
 			graphic->addEntity(line);
 
 /*
 			for (double mx=-60.0; mx<60.0; mx+=1.0) {
 				//for (double mx=0.0; mx<1.0; mx+=2.5) {
 				VectorSolutions sol = ellipse->mapX(xp + mx);
-				//graphic->addEntity(new RS_Point(graphic,
+				//graphic->addEntity(new Point(graphic,
 				//                   sol.vector2 + Vector(a*500.0, 0.0)));
-				//graphic->addEntity(new RS_Point(graphic,
+				//graphic->addEntity(new Point(graphic,
 				//                   sol.vector3 + Vector(a*500.0, 0.0)));
-				//graphic->addEntity(new RS_Point(graphic,
+				//graphic->addEntity(new Point(graphic,
 				//                   sol.vector4 + Vector(a*500.0, 0.0)));
 
-				line = new RS_Line(graphic,
-								RS_LineData(Vector(xp+mx,-50.0),
+				line = new Line(graphic,
+								LineData(Vector(xp+mx,-50.0),
 											Vector(xp+mx,50.0)));
-				line->setPen(RS_Pen(RS_Color(60, 60, 60),
+				line->setPen(Pen(Color(60, 60, 60),
 									RS2::Width01,
 									RS2::SolidLine));
 				graphic->addEntity(line);
 
-				graphic->addEntity(new RS_Point(graphic,
+				graphic->addEntity(new Point(graphic,
 												sol.get(0)));
 			}
 */
@@ -3562,22 +3557,22 @@ void ApplicationWindow::slotTestInsertEllipse()
 					for (x=-250.0; x<=250.0; x+=50.0) {
 						Vector v(x, y);
 
-						ellipse = new RS_Ellipse(graphic,
+						ellipse = new Ellipse(graphic,
 												v,
 												Vector((x/5+50.0)/2.0, 0.0),
 											fabs(x/y),
 												0.0, 2*M_PI,
 												false);
 
-				ellipse->setPen(RS_Pen(RS_Color(255, 255, 0),
+				ellipse->setPen(Pen(Color(255, 255, 0),
 										RS2::Width01,
 										RS2::DashDotLine));
 
 						graphic->addEntity(ellipse);
-						graphic->addEntity(new RS_Point(graphic, ellipse->getMax()));
-						graphic->addEntity(new RS_Point(graphic, ellipse->getMin()));
+						graphic->addEntity(new Point(graphic, ellipse->getMax()));
+						graphic->addEntity(new Point(graphic, ellipse->getMin()));
 
-				ellipse = new RS_Ellipse(graphic,
+				ellipse = new Ellipse(graphic,
 												v + Vector(750.0, 0.0),
 												Vector((x/5+50.0)/2.0, 0.0),
 												fabs(x/y),
@@ -3585,8 +3580,8 @@ void ApplicationWindow::slotTestInsertEllipse()
 												true);
 
 						graphic->addEntity(ellipse);
-						graphic->addEntity(new RS_Point(graphic, ellipse->getMax()));
-						graphic->addEntity(new RS_Point(graphic, ellipse->getMin()));
+						graphic->addEntity(new Point(graphic, ellipse->getMax()));
+						graphic->addEntity(new Point(graphic, ellipse->getMin()));
 					}
 				}
 		*/
@@ -3595,15 +3590,15 @@ void ApplicationWindow::slotTestInsertEllipse()
 				// different rotation angles:
 				double rot;
 				for (rot=0.0; rot<=2*M_PI+0.1; rot+=(M_PI/8)) {
-					ellipse = new RS_Ellipse(graphic,
+					ellipse = new Ellipse(graphic,
 											Vector(rot*200, 500.0),
 											Vector(50.0, 0.0).rotate(rot),
 											0.3,
 											0.0, 2*M_PI,
 											false);
 					graphic->addEntity(ellipse);
-					graphic->addEntity(new RS_Point(graphic, ellipse->getMax()));
-					graphic->addEntity(new RS_Point(graphic, ellipse->getMin()));
+					graphic->addEntity(new Point(graphic, ellipse->getMax()));
+					graphic->addEntity(new Point(graphic, ellipse->getMin()));
 				}
 
 
@@ -3612,7 +3607,7 @@ void ApplicationWindow::slotTestInsertEllipse()
 				for (rot=0.0; rot<=2*M_PI+0.1; rot+=(M_PI/8)) {
 					for (a1=0.0; a1<=2*M_PI+0.1; a1+=(M_PI/8)) {
 						for (a2=a1+M_PI/8; a2<=2*M_PI+a1+0.1; a2+=(M_PI/8)) {
-							ellipse = new RS_Ellipse(graphic,
+							ellipse = new Ellipse(graphic,
 													Vector(-500.0-a1*200.0-5000.0*rot,
 																500.0-a2*200.0),
 													Vector(50.0, 0.0).rotate(rot),
@@ -3620,8 +3615,8 @@ void ApplicationWindow::slotTestInsertEllipse()
 													a1, a2,
 													false);
 							graphic->addEntity(ellipse);
-							graphic->addEntity(new RS_Point(graphic, ellipse->getMax()));
-							graphic->addEntity(new RS_Point(graphic, ellipse->getMin()));
+							graphic->addEntity(new Point(graphic, ellipse->getMax()));
+							graphic->addEntity(new Point(graphic, ellipse->getMin()));
 						}
 					}
 				}
@@ -3639,9 +3634,9 @@ void ApplicationWindow::slotTestInsertEllipse()
  */
 void ApplicationWindow::slotTestInsertText()
 {
-	RS_DEBUG->print("ApplicationWindow::slotTestInsertText()");
+	DEBUG->print("ApplicationWindow::slotTestInsertText()");
 
-	RS_Document * d = getDocument();
+	Document * d = getDocument();
 
 	if (d != NULL)
 	{
@@ -3650,13 +3645,13 @@ void ApplicationWindow::slotTestInsertText()
 		if (graphic == NULL)
 			return;
 
-		RS_Text * text;
-		RS_TextData textData;
+		Text * text;
+		TextData textData;
 
-		textData = RS_TextData(Vector(10.0, 10.0), 10.0, 100.0, RS2::VAlignTop, RS2::HAlignLeft, RS2::LeftToRight, RS2::Exact, 1.0, "Andrew", "normal", 0.0);
-		text = new RS_Text(graphic, textData);
+		textData = TextData(Vector(10.0, 10.0), 10.0, 100.0, RS2::VAlignTop, RS2::HAlignLeft, RS2::LeftToRight, RS2::Exact, 1.0, "Andrew", "normal", 0.0);
+		text = new Text(graphic, textData);
 		text->setLayerToActive();
-		text->setPen(RS_Pen(RS_Color(255, 0, 0), RS2::Width01, RS2::SolidLine));
+		text->setPen(Pen(Color(255, 0, 0), RS2::Width01, RS2::SolidLine));
 		graphic->addEntity(text);
 
 /*
@@ -3665,7 +3660,7 @@ void ApplicationWindow::slotTestInsertText()
 			for (x=-250.0; x<=250.0; x+=50.0) {
 				Vector v(x, y);
 
-				textData = RS_TextData(v,
+				textData = TextData(v,
 										10.0, 100.0,
 										RS2::VAlignTop,
 										RS2::HAlignLeft,
@@ -3676,28 +3671,28 @@ void ApplicationWindow::slotTestInsertText()
 										"normal",
 										0.0);
 
-				text = new RS_Text(graphic, textData);
+				text = new Text(graphic, textData);
 
 				text->setLayerToActive();
-				text->setPen(RS_Pen(RS_Color(255, 0, 0),
+				text->setPen(Pen(Color(255, 0, 0),
 									RS2::Width01,
 									RS2::SolidLine));
 				graphic->addEntity(text);
 			}
 		}
 
-		RS_Line* line;
+		Line* line;
 		for (x=0.0; x<M_PI*2.0; x+=0.2) {
 			Vector v(600.0+cos(x)*50.0, 0.0+sin(x)*50.0);
 
-			line = new RS_Line(graphic,
-								RS_LineData(Vector(600.0,0.0),
+			line = new Line(graphic,
+								LineData(Vector(600.0,0.0),
 											v));
 			line->setLayerToActive();
 			line->setPenToActive();
 			graphic->addEntity(line);
 
-			textData = RS_TextData(v,
+			textData = TextData(v,
 									5.0, 50.0,
 									RS2::VAlignTop,
 									RS2::HAlignLeft,
@@ -3708,23 +3703,23 @@ void ApplicationWindow::slotTestInsertText()
 									"normal",
 									x);
 
-			text = new RS_Text(graphic, textData);
+			text = new Text(graphic, textData);
 
 			text->setLayerToActive();
-			text->setPen(RS_Pen(RS_Color(255, 0, 0),
+			text->setPen(Pen(Color(255, 0, 0),
 								RS2::Width01,
 								RS2::SolidLine));
 			graphic->addEntity(text);
 		}
 
-		RS_SolidData solidData = RS_SolidData(Vector(5.0, 10.0),
+		SolidData solidData = SolidData(Vector(5.0, 10.0),
 											Vector(25.0, 15.0),
 											Vector(15.0, 30.0));
 
-		RS_Solid* s = new RS_Solid(graphic, solidData);
+		Solid* s = new Solid(graphic, solidData);
 
 		s->setLayerToActive();
-		s->setPen(RS_Pen(RS_Color(255, 255, 0),
+		s->setPen(Pen(Color(255, 255, 0),
 						RS2::Width01,
 						RS2::SolidLine));
 		graphic->addEntity(s);
@@ -3742,9 +3737,9 @@ void ApplicationWindow::slotTestInsertText()
  */
 void ApplicationWindow::slotTestInsertImage()
 {
-	RS_DEBUG->print("ApplicationWindow::slotTestInsertImage()");
+	DEBUG->print("ApplicationWindow::slotTestInsertImage()");
 
-	RS_Document * d = getDocument();
+	Document * d = getDocument();
 
 	if (d != NULL)
 	{
@@ -3753,14 +3748,14 @@ void ApplicationWindow::slotTestInsertImage()
 		if (graphic == NULL)
 			return;
 
-		RS_Image * image;
-		RS_ImageData imageData;
+		Image * image;
+		ImageData imageData;
 
-		imageData = RS_ImageData(0, Vector(50.0, 30.0), Vector(0.5, 0.5), Vector(-0.5, 0.5), Vector(640, 480), "/home/andrew/data/image.png", 50, 50, 0);
-		image = new RS_Image(graphic, imageData);
+		imageData = ImageData(0, Vector(50.0, 30.0), Vector(0.5, 0.5), Vector(-0.5, 0.5), Vector(640, 480), "/home/andrew/data/image.png", 50, 50, 0);
+		image = new Image(graphic, imageData);
 
 		image->setLayerToActive();
-		image->setPen(RS_Pen(RS_Color(255, 0, 0), RS2::Width01, RS2::SolidLine));
+		image->setPen(Pen(Color(255, 0, 0), RS2::Width01, RS2::SolidLine));
 		graphic->addEntity(image);
 	}
 }
@@ -3770,17 +3765,17 @@ void ApplicationWindow::slotTestInsertImage()
  */
 void ApplicationWindow::slotTestUnicode()
 {
-    RS_DEBUG->print("ApplicationWindow::slotTestUnicode()");
+    DEBUG->print("ApplicationWindow::slotTestUnicode()");
 
     slotFileOpen("./fonts/unicode.cxf", RS2::FormatCXF);
-    RS_Document* d = getDocument();
+    Document* d = getDocument();
     if (d!=NULL) {
         Drawing* graphic = (Drawing*)d;
         if (graphic==NULL) {
             return;
         }
 
-        RS_Insert* ins;
+        Insert* ins;
 
         int col;
         int row;
@@ -3804,14 +3799,14 @@ void ApplicationWindow::slotTestUnicode()
                 strCode = "[" + strCode + "] " + uCode;
 
                 if (graphic->findBlock(strCode)!=NULL) {
-                    RS_InsertData d(strCode,
+                    InsertData d(strCode,
                                     Vector(col/0x10*20.0,row*20.0),
                                     Vector(1.0,1.0), 0.0,
                                     1, 1, Vector(0.0, 0.0),
                                     NULL, RS2::NoUpdate);
-                    ins = new RS_Insert(graphic, d);
+                    ins = new Insert(graphic, d);
                     ins->setLayerToActive();
-                    ins->setPen(RS_Pen(RS_Color(255, 255, 255),
+                    ins->setPen(Pen(Color(255, 255, 255),
                                        RS2::Width01,
                                        RS2::SolidLine));
                     ins->update();
@@ -3829,9 +3824,9 @@ void ApplicationWindow::slotTestUnicode()
  */
 void ApplicationWindow::slotTestMath01()
 {
-    RS_DEBUG->print("ApplicationWindow::slotTestMath01()");
+    DEBUG->print("ApplicationWindow::slotTestMath01()");
 
-    RS_Document* d = getDocument();
+    Document* d = getDocument();
     if (d!=NULL) {
         Drawing* graphic = (Drawing*)d;
         if (graphic==NULL) {
@@ -3839,11 +3834,11 @@ void ApplicationWindow::slotTestMath01()
         }
 
         // axis
-        graphic->addEntity(new RS_Line(graphic,
-                                       RS_LineData(Vector(0.0,0.0),
+        graphic->addEntity(new Line(graphic,
+                                       LineData(Vector(0.0,0.0),
                                                    Vector(2*M_PI,0.0))));
-        graphic->addEntity(new RS_Line(graphic,
-                                       RS_LineData(Vector(0.0,-1.0),
+        graphic->addEntity(new Line(graphic,
+                                       LineData(Vector(0.0,-1.0),
                                                    Vector(0.0,1.0))));
 
         // cos
@@ -3852,29 +3847,29 @@ void ApplicationWindow::slotTestMath01()
         double x_0 = 60.0/ARAD;
         for (a=0.01; a<2*M_PI; a+=0.01) {
             // cos curve:
-            RS_Line* line = new RS_Line(graphic,
-                                        RS_LineData(Vector(a-0.01, cos(a-0.01)),
+            Line* line = new Line(graphic,
+                                        LineData(Vector(a-0.01, cos(a-0.01)),
                                                     Vector(a, cos(a))));
             graphic->addEntity(line);
 
             // tangent:
-            graphic->addEntity(new RS_Line(graphic,
-                                           RS_LineData(Vector(a-0.01,cos(x_0)-sin(x_0)*(a-0.01-x_0)),
+            graphic->addEntity(new Line(graphic,
+                                           LineData(Vector(a-0.01,cos(x_0)-sin(x_0)*(a-0.01-x_0)),
                                                        Vector(a,cos(x_0)-sin(x_0)*(a-x_0)))));
         }
 
         // 59.0 deg
-        graphic->addEntity(new RS_Line(graphic,
-                                       RS_LineData(Vector(x,0.0),
+        graphic->addEntity(new Line(graphic,
+                                       LineData(Vector(x,0.0),
                                                    Vector(x,1.0))));
 
         // 60.0 deg
-        graphic->addEntity(new RS_Line(graphic,
-                                       RS_LineData(Vector(x_0,0.0),
+        graphic->addEntity(new Line(graphic,
+                                       LineData(Vector(x_0,0.0),
                                                    Vector(x_0,1.0))));
 
         // tangent
-        //graphic->addEntity(new RS_Line(graphic,
+        //graphic->addEntity(new Line(graphic,
         //                   Vector(0.0,cos(x_0)-sin(x_0)*(0.0-x_0)),
         //                   Vector(6.0,cos(x_0)-sin(x_0)*(6.0-x_0))));
 
@@ -3891,7 +3886,7 @@ void ApplicationWindow::slotTestMath01()
  */
 void ApplicationWindow::slotTestResize640()
 {
-    RS_DEBUG->print("ApplicationWindow::slotTestResize640()");
+    DEBUG->print("ApplicationWindow::slotTestResize640()");
 
     resize(640, 480);
 }
@@ -3901,7 +3896,7 @@ void ApplicationWindow::slotTestResize640()
  */
 void ApplicationWindow::slotTestResize800()
 {
-    RS_DEBUG->print("ApplicationWindow::slotTestResize800()");
+    DEBUG->print("ApplicationWindow::slotTestResize800()");
 
     resize(800, 600);
 }
@@ -3911,7 +3906,7 @@ void ApplicationWindow::slotTestResize800()
  */
 void ApplicationWindow::slotTestResize1024()
 {
-    RS_DEBUG->print("ApplicationWindow::slotTestResize1024()");
+    DEBUG->print("ApplicationWindow::slotTestResize1024()");
 
     resize(1024, 768);
 }
@@ -3921,7 +3916,7 @@ void ApplicationWindow::slotTestResize1024()
  */
 bool ApplicationWindow::queryExit(bool force)
 {
-	RS_DEBUG->print("ApplicationWindow::queryExit()");
+	DEBUG->print("ApplicationWindow::queryExit()");
 
 	bool succ = true;
 
@@ -3959,7 +3954,7 @@ bool ApplicationWindow::queryExit(bool force)
 	if (succ)
 		storeSettings();
 
-	RS_DEBUG->print("ApplicationWindow::queryExit(): OK");
+	DEBUG->print("ApplicationWindow::queryExit(): OK");
 
 	return succ;
 }
@@ -4114,20 +4109,20 @@ QMdiArea * ApplicationWindow::getWorkspace()
  */
 MDIWindow * ApplicationWindow::getMDIWindow()
 {
-	RS_DEBUG->print(/*RS_Debug::D_CRITICAL,*/ "ApplicationWindow::getMDIWindow: workspace=%08X", workspace);
+	DEBUG->print(/*Debug::D_CRITICAL,*/ "ApplicationWindow::getMDIWindow: workspace=%08X", workspace);
 
 	if (workspace)
 	{
-		RS_DEBUG->print("ApplicationWindow::getMDIWindow: activeSubWindow=%08X", workspace->activeSubWindow());
+		DEBUG->print("ApplicationWindow::getMDIWindow: activeSubWindow=%08X", workspace->activeSubWindow());
 		return (MDIWindow *)workspace->activeSubWindow();
 	}
 
-	RS_DEBUG->print("ApplicationWindow::getMDIWindow: activeSubWindow=??? (workspace == NULL)");
+	DEBUG->print("ApplicationWindow::getMDIWindow: activeSubWindow=??? (workspace == NULL)");
 	return NULL;
 }
 
 /**
- * Implementation from RS_MainWindowInterface (and QS_ScripterHostInterface).
+ * Implementation from MainWindowInterface (and QS_ScripterHostInterface).
  *
  * @return Pointer to the graphic view of the currently active document
  * window or NULL if no window is available.
@@ -4140,12 +4135,12 @@ MDIWindow * ApplicationWindow::getMDIWindow()
 }
 
 /**
- * Implementation from RS_MainWindowInterface (and QS_ScripterHostInterface).
+ * Implementation from MainWindowInterface (and QS_ScripterHostInterface).
  *
  * @return Pointer to the graphic document of the currently active document
  * window or NULL if no window is available.
  */
-/*virtual*/ RS_Document * ApplicationWindow::getDocument()
+/*virtual*/ Document * ApplicationWindow::getDocument()
 {
 	MDIWindow * m = getMDIWindow();
 
@@ -4153,10 +4148,10 @@ MDIWindow * ApplicationWindow::getMDIWindow()
 }
 
 /**
- * Creates a new document. Implementation from RS_MainWindowInterface.
+ * Creates a new document. Implementation from MainWindowInterface.
  */
 /*virtual*/ void ApplicationWindow::createNewDocument(const QString & fileName/*= QString::null*/,
-	RS_Document * doc/*= NULL*/)
+	Document * doc/*= NULL*/)
 {
 	slotFileNew(doc);
 
@@ -4177,7 +4172,7 @@ MDIWindow * ApplicationWindow::getMDIWindow()
 /**
  * @return Pointer to action handler. Implementation from QG_MainWindowInterface.
  */
-/*virtual*/ QG_ActionHandler * ApplicationWindow::getActionHandler()
+/*virtual*/ ActionHandler * ApplicationWindow::getActionHandler()
 {
 	return actionHandler;
 }
@@ -4192,7 +4187,7 @@ MDIWindow * ApplicationWindow::getMDIWindow()
 #endif
 }
 
-#ifdef RS_SCRIPTING
+#ifdef SCRIPTING
 /**
  * @return Pointer to the qsa object.
  */