]> Shamusworld >> Repos - architektonas/blobdiff - src/mainapp/applicationwindow.cpp
Removed more QC_ madness...
[architektonas] / src / mainapp / applicationwindow.cpp
similarity index 88%
rename from src/mainapp/qc_applicationwindow.cpp
rename to src/mainapp/applicationwindow.cpp
index 9b173a37337486987564bdf629f7b21dc6dca8c5..e91576fcfeb078a2e4a75823032e8651a75bb338 100644 (file)
@@ -1,4 +1,4 @@
-// qc_applicationwindow.cpp
+// applicationwindow.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 //                  Qt4's much more sensible action handling
 //
 
-#include "qc_applicationwindow.h"
+#include "applicationwindow.h"
 
 #include <fstream>
 #include "rs_actiondrawlinefree.h"
+#include "rs_actionlibraryinsert.h"
 #include "rs_actionprintpreview.h"
 #include "rs_creation.h"
 #include "rs_dialogfactory.h"
 #include "rs_dimlinear.h"
 #include "rs_dimradial.h"
 #include "rs_ellipse.h"
-#include "rs_hatch.h"
-#include "rs_image.h"
 #include "rs_fileio.h"
+#include "rs_hatch.h"
 #include "rs_insert.h"
-#include "rs_text.h"
-#include "settings.h"
+#include "rs_image.h"
+#include "paintintf.h"
 #include "rs_script.h"
 #include "rs_scriptlist.h"
+#include "settings.h"
 #include "rs_solid.h"
 #include "rs_staticgraphicview.h"
 #include "rs_system.h"
-#include "rs_actionlibraryinsert.h"
+#include "rs_text.h"
 #include "rs_units.h"
-#include "paintintf.h"
 
 #ifdef RS_CAM
 #include "rs_camdialog.h"
 #include "mousewidget.h"
 #include "selectionwidget.h"
 
-#include "qc_mdiwindow.h"
+#include "mdiwindow.h"
 #include "qc_dialogfactory.h"
 #include "createqtactions.h"
 #include "main.h"
 
-QC_ApplicationWindow * QC_ApplicationWindow::appWindow = NULL;
+ApplicationWindow * ApplicationWindow::appWindow = NULL;
 
 #ifndef QC_APP_ICON
 # define QC_APP_ICON "qcad.png"
@@ -74,45 +74,45 @@ extern QSplashScreen * splash;
 /**
  * Constructor. Initializes the app.
  */
-QC_ApplicationWindow::QC_ApplicationWindow():
+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("QC_ApplicationWindow::QC_ApplicationWindow");
+       RS_DEBUG->print("ApplicationWindow::ApplicationWindow");
 
        appWindow = this;
 //no    assistant = NULL;
        workspace = NULL;
 
-       RS_DEBUG->print("QC_ApplicationWindow::QC_ApplicationWindow: setting icon");
+       RS_DEBUG->print("ApplicationWindow::ApplicationWindow: setting icon");
 //     setIcon(qPixmapFromMimeSource(QC_APP_ICON));
 //     setWindowIcon(qPixmapFromMimeSource(QC_APP_ICON));
        setWindowIcon(QIcon(":/res/" QC_APP_ICON));
 
-       RS_DEBUG->print("QC_ApplicationWindow::QC_ApplicationWindow: creating action handler");
+       RS_DEBUG->print("ApplicationWindow::ApplicationWindow: creating action handler");
        actionHandler = new QG_ActionHandler(this);
-       RS_DEBUG->print("QC_ApplicationWindow::QC_ApplicationWindow: creating action handler: OK");
+       RS_DEBUG->print("ApplicationWindow::ApplicationWindow: creating action handler: OK");
 
 #ifdef RS_SCRIPTING
-       RS_DEBUG->print("QC_ApplicationWindow::QC_ApplicationWindow: creating scripter");
+       RS_DEBUG->print("ApplicationWindow::ApplicationWindow: creating scripter");
        scripter = new QS_Scripter(this, this);
-       RS_DEBUG->print("QC_ApplicationWindow::QC_ApplicationWindow: creating scripter: OK");
+       RS_DEBUG->print("ApplicationWindow::ApplicationWindow: creating scripter: OK");
 #endif
 
-       RS_DEBUG->print("QC_ApplicationWindow::QC_ApplicationWindow: init view");
+       RS_DEBUG->print("ApplicationWindow::ApplicationWindow: init view");
        initView();
-       RS_DEBUG->print("QC_ApplicationWindow::QC_ApplicationWindow: init toolbar");
+       RS_DEBUG->print("ApplicationWindow::ApplicationWindow: init toolbar");
        initToolBar();
-       RS_DEBUG->print("QC_ApplicationWindow::QC_ApplicationWindow: init actions");
+       RS_DEBUG->print("ApplicationWindow::ApplicationWindow: init actions");
        initActions();
-       RS_DEBUG->print("QC_ApplicationWindow::QC_ApplicationWindow: init menu bar");
+       RS_DEBUG->print("ApplicationWindow::ApplicationWindow: init menu bar");
        initMenuBar();
-       RS_DEBUG->print("QC_ApplicationWindow::QC_ApplicationWindow: init status bar");
+       RS_DEBUG->print("ApplicationWindow::ApplicationWindow: init status bar");
        initStatusBar();
 
-       RS_DEBUG->print("QC_ApplicationWindow::QC_ApplicationWindow: creating dialogFactory");
+       RS_DEBUG->print("ApplicationWindow::ApplicationWindow: creating dialogFactory");
        dialogFactory = new QC_DialogFactory(this, optionWidget);
-       RS_DEBUG->print("QC_ApplicationWindow::QC_ApplicationWindow: creating dialogFactory: OK");
+       RS_DEBUG->print("ApplicationWindow::ApplicationWindow: creating dialogFactory: OK");
        RS_DEBUG->print("setting dialog factory object");
 
        if (RS_DialogFactory::instance() == NULL)
@@ -123,10 +123,10 @@ QC_ApplicationWindow::QC_ApplicationWindow():
        RS_DialogFactory::instance()->setFactoryObject(dialogFactory);
        RS_DEBUG->print("setting dialog factory object: OK");
 
-       RS_DEBUG->print("QC_ApplicationWindow::QC_ApplicationWindow: init settings");
+       RS_DEBUG->print("ApplicationWindow::ApplicationWindow: init settings");
        initSettings();
 
-       RS_DEBUG->print("QC_ApplicationWindow::QC_ApplicationWindow: init MDI");
+       RS_DEBUG->print("ApplicationWindow::ApplicationWindow: init MDI");
        initMDI();
 
        // Disable menu and toolbar items
@@ -140,37 +140,37 @@ QC_ApplicationWindow::QC_ApplicationWindow():
 /**
  * Destructor.
  */
-QC_ApplicationWindow::~QC_ApplicationWindow()
+ApplicationWindow::~ApplicationWindow()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::~QC_ApplicationWindow");
+       RS_DEBUG->print("ApplicationWindow::~ApplicationWindow");
 #ifdef RS_SCRIPTING
-       RS_DEBUG->print("QC_ApplicationWindow::~QC_ApplicationWindow: deleting scripter");
+       RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting scripter");
        delete scripter;
-       RS_DEBUG->print("QC_ApplicationWindow::~QC_ApplicationWindow: deleting scripter: OK");
+       RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting scripter: OK");
 #endif
 
-       RS_DEBUG->print("QC_ApplicationWindow::~QC_ApplicationWindow: deleting action handler");
+       RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting action handler");
        delete actionHandler;
-       RS_DEBUG->print("QC_ApplicationWindow::~QC_ApplicationWindow: deleting action handler: OK");
+       RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting action handler: OK");
 
-       RS_DEBUG->print("QC_ApplicationWindow::~QC_ApplicationWindow: deleting dialog factory");
+       RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting dialog factory");
        delete dialogFactory;
-       RS_DEBUG->print("QC_ApplicationWindow::~QC_ApplicationWindow: deleting dialog factory: OK");
+       RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: deleting dialog factory: OK");
 
-//no    RS_DEBUG->print("QC_ApplicationWindow::~QC_ApplicationWindow: "
+//no    RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: "
 //                    "deleting assistant..");
 //    if (assistant!=NULL) {
 //        delete assistant;
 //    }
-//    RS_DEBUG->print("QC_ApplicationWindow::~QC_ApplicationWindow: "
+//    RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: "
 //                    "deleting assistant: OK");
-       RS_DEBUG->print("QC_ApplicationWindow::~QC_ApplicationWindow: OK");
+       RS_DEBUG->print("ApplicationWindow::~ApplicationWindow: OK");
 }
 
 /**
  * Runs the start script if scripting is available.
  */
-void QC_ApplicationWindow::slotRunStartScript()
+void ApplicationWindow::slotRunStartScript()
 {
        slotRunScript("autostart.qs");
 }
@@ -179,16 +179,16 @@ void QC_ApplicationWindow::slotRunStartScript()
  * Runs a script. The action that triggers this slot has to carry the
  * name of the script file.
  */
-void QC_ApplicationWindow::slotRunScript()
+void ApplicationWindow::slotRunScript()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotRunScript");
+       RS_DEBUG->print("ApplicationWindow::slotRunScript");
 
        const QObject * s = sender();
 
        if (s != NULL)
        {
                QString script = ((QAction *)s)->text();
-               RS_DEBUG->print("QC_ApplicationWindow::slotRunScript: %s", script.toLatin1().data());
+               RS_DEBUG->print("ApplicationWindow::slotRunScript: %s", script.toLatin1().data());
                slotRunScript(script);
        }
 }
@@ -196,14 +196,14 @@ void QC_ApplicationWindow::slotRunScript()
 /**
  * Runs the script with the given name.
  */
-void QC_ApplicationWindow::slotRunScript(const QString & name)
+void ApplicationWindow::slotRunScript(const QString & name)
 {
 #ifdef RS_SCRIPTING
-       RS_DEBUG->print("QC_ApplicationWindow::slotRunScript");
+       RS_DEBUG->print("ApplicationWindow::slotRunScript");
 
        if (scripter == NULL)
        {
-               RS_DEBUG->print(RS_Debug::D_WARNING, "QC_ApplicationWindow::slotRunScript: scripter not initialized");
+               RS_DEBUG->print(RS_Debug::D_WARNING, "ApplicationWindow::slotRunScript: scripter not initialized");
                return;
        }
 
@@ -214,12 +214,12 @@ void QC_ApplicationWindow::slotRunScript(const QString & name)
 
        for (QStringList::Iterator it = scriptList.begin(); it!=scriptList.end(); ++it)
        {
-               RS_DEBUG->print("QC_ApplicationWindow::slotRunScript: checking script '%s'", (*it).toLatin1().data();
+               RS_DEBUG->print("ApplicationWindow::slotRunScript: checking script '%s'", (*it).toLatin1().data();
                QFileInfo fi(*it);
 
                if (fi.exists() && fi.fileName() == name)
                {
-                       RS_DEBUG->print("QC_ApplicationWindow::slotRunScript: running '%s'", (*it).toLatin1().data());
+                       RS_DEBUG->print("ApplicationWindow::slotRunScript: running '%s'", (*it).toLatin1().data());
                        scripter->runScript(*it, "main");
                }
        }
@@ -230,14 +230,14 @@ void QC_ApplicationWindow::slotRunScript(const QString & name)
  * Called from toolbar buttons that were added by scripts to
  * insert blocks.
  */
-void QC_ApplicationWindow::slotInsertBlock()
+void ApplicationWindow::slotInsertBlock()
 {
        const QObject * s = sender();
 
        if (s != NULL)
        {
                QString block = ((QAction *)s)->text();
-               RS_DEBUG->print("QC_ApplicationWindow::slotInsertBlock: %s", block.toLatin1().data());
+               RS_DEBUG->print("ApplicationWindow::slotInsertBlock: %s", block.toLatin1().data());
                slotInsertBlock(block);
        }
 }
@@ -245,9 +245,9 @@ void QC_ApplicationWindow::slotInsertBlock()
 /**
  * Called to insert blocks.
  */
-void QC_ApplicationWindow::slotInsertBlock(const QString & name)
+void ApplicationWindow::slotInsertBlock(const QString & name)
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotInsertBlock: '%s'", name.toLatin1().data());
+       RS_DEBUG->print("ApplicationWindow::slotInsertBlock: '%s'", name.toLatin1().data());
 
        statusBar()->showMessage(tr("Inserting block '%1'").arg(name), 2000);
 
@@ -265,7 +265,7 @@ void QC_ApplicationWindow::slotInsertBlock(const QString & name)
 /**
  * Shows the main application window and a splash screen.
  */
-void QC_ApplicationWindow::show()
+void ApplicationWindow::show()
 {
 #ifdef QSPLASHSCREEN_H
        if (splash)
@@ -292,7 +292,7 @@ void QC_ApplicationWindow::show()
 /**
  * Called when the splash screen has to terminate.
  */
-void QC_ApplicationWindow::finishSplashScreen()
+void ApplicationWindow::finishSplashScreen()
 {
 #ifdef QSPLASHSCREEN_H
        if (splash)
@@ -307,17 +307,17 @@ void QC_ApplicationWindow::finishSplashScreen()
 /**
  * Close Event. Called when the user tries to close the app.
  */
-void QC_ApplicationWindow::closeEvent(QCloseEvent * /*ce*/)
+void ApplicationWindow::closeEvent(QCloseEvent * /*ce*/)
 {
-       RS_DEBUG->print("QC_ApplicationWindow::closeEvent()");
+       RS_DEBUG->print("ApplicationWindow::closeEvent()");
        slotFileQuit();
-       RS_DEBUG->print("QC_ApplicationWindow::closeEvent(): OK");
+       RS_DEBUG->print("ApplicationWindow::closeEvent(): OK");
 }
 
 /**
  * Handles right-clicks for moving back to the last cad tool bar.
  */
-void QC_ApplicationWindow::mouseReleaseEvent(QMouseEvent * e)
+void ApplicationWindow::mouseReleaseEvent(QMouseEvent * e)
 {
        if (e->button() == Qt::RightButton && cadToolBar != NULL)
                cadToolBar->showToolBarMain();
@@ -328,9 +328,9 @@ void QC_ApplicationWindow::mouseReleaseEvent(QMouseEvent * e)
 /**
  * Initializes the MDI workspace.
  */
-void QC_ApplicationWindow::initMDI()
+void ApplicationWindow::initMDI()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::initMDI() begin");
+       RS_DEBUG->print("ApplicationWindow::initMDI() begin");
 
 /* Could use QVBoxLayout instead of Q3VBox, but do we even need to? */
 //     Q3VBox * vb = new Q3VBox(this);
@@ -340,14 +340,14 @@ void QC_ApplicationWindow::initMDI()
 //     workspace->setScrollBarsEnabled(true);
 //     setCentralWidget(vb);
        setCentralWidget(workspace);//JLH:hmm. (Yes, it works! \o/)
-       RS_DEBUG->print("QC_ApplicationWindow::initMDI(): workspace=%08X", workspace);
+       RS_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("QC_ApplicationWindow::initMDI() end");
+       RS_DEBUG->print("ApplicationWindow::initMDI() end");
 }
 
 /**
@@ -355,9 +355,9 @@ void QC_ApplicationWindow::initMDI()
  * (Actually, it creates all application menus & toolbars. All actions are
  *  created in CreateQtActions() and simply referenced here.)
  */
-void QC_ApplicationWindow::initActions()
+void ApplicationWindow::initActions()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::initActions()");
+       RS_DEBUG->print("ApplicationWindow::initActions()");
        CreateQtActions(this);
 
        //
@@ -1205,9 +1205,9 @@ void QC_ApplicationWindow::initActions()
 /**
  * Initializes the menu bar.
  */
-void QC_ApplicationWindow::initMenuBar()
+void ApplicationWindow::initMenuBar()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::initMenuBar()");
+       RS_DEBUG->print("ApplicationWindow::initMenuBar()");
 
        // menuBar entry windowsMenu
        windowsMenu = new QMenu(tr("&Window"), this);
@@ -1268,9 +1268,9 @@ void QC_ApplicationWindow::initMenuBar()
 /**
  * Initializes the tool bars (file tool bar and pen tool bar).
  */
-void QC_ApplicationWindow::initToolBar()
+void ApplicationWindow::initToolBar()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::initToolBar()");
+       RS_DEBUG->print("ApplicationWindow::initToolBar()");
 
 //     fileToolBar = new Q3ToolBar(this, "File Operations");
        fileToolBar = addToolBar(tr("File Operations"));
@@ -1329,9 +1329,9 @@ void QC_ApplicationWindow::initToolBar()
 /**
  * Initializes the status bar at the bottom.
  */
-void QC_ApplicationWindow::initStatusBar()
+void ApplicationWindow::initStatusBar()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::initStatusBar()");
+       RS_DEBUG->print("ApplicationWindow::initStatusBar()");
 
        statusBar()->setMinimumHeight(32);
        coordinateWidget = new CoordinateWidget(statusBar());//, "coordinates");
@@ -1346,9 +1346,9 @@ void QC_ApplicationWindow::initStatusBar()
  * Initializes the global application settings from the
  * config file (unix, mac) or registry (windows).
  */
-void QC_ApplicationWindow::initSettings()
+void ApplicationWindow::initSettings()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::initSettings()");
+       RS_DEBUG->print("ApplicationWindow::initSettings()");
        settings.beginGroup("RecentFiles");
 
        for(int i=0; i<recentFiles->Maximum(); ++i)
@@ -1386,9 +1386,9 @@ void QC_ApplicationWindow::initSettings()
 /**
  * Stores the global application settings to file or registry.
  */
-void QC_ApplicationWindow::storeSettings()
+void ApplicationWindow::storeSettings()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::storeSettings()");
+       RS_DEBUG->print("ApplicationWindow::storeSettings()");
 
        settings.beginGroup("RecentFiles");
 
@@ -1403,15 +1403,15 @@ void QC_ApplicationWindow::storeSettings()
        settings.setValue("DockWindows", saveState());
        settings.endGroup();
 
-       RS_DEBUG->print("QC_ApplicationWindow::storeSettings(): OK");
+       RS_DEBUG->print("ApplicationWindow::storeSettings(): OK");
 }
 
 /**
  * Initializes the view.
  */
-void QC_ApplicationWindow::initView()
+void ApplicationWindow::initView()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::initView()");
+       RS_DEBUG->print("ApplicationWindow::initView()");
 
        RS_DEBUG->print("init view..");
        QDockWidget * dw;
@@ -1525,7 +1525,7 @@ void QC_ApplicationWindow::initView()
  * Implementation from QG_MainWindowInterface.
  * Can be called from scripts to add individual GUI elements.
  */
-/*QToolBar* QC_ApplicationWindow::createToolBar(const QString& name) {
+/*QToolBar* ApplicationWindow::createToolBar(const QString& name) {
     QToolBar* tb = new QToolBar(this, name);
        tb->setLabel(name);
        return tb;
@@ -1534,7 +1534,7 @@ void QC_ApplicationWindow::initView()
 /**
  * Creates a new button in the given tool bar for running a script.
  */
-/*void QC_ApplicationWindow::addToolBarButton(QToolBar* tb) {
+/*void ApplicationWindow::addToolBarButton(QToolBar* tb) {
        if (tb!=NULL) {
        QAction* action = new QAction("Blah",
                        QPixmap::fromMimeSource("zoomwindow.png"),
@@ -1544,13 +1544,13 @@ void QC_ApplicationWindow::initView()
        }
 }*/
 
-#warning "!!! QC_ApplicationWindow::updateRecentFilesMenu() is DEPRECATED !!!"
+#warning "!!! ApplicationWindow::updateRecentFilesMenu() is DEPRECATED !!!"
 /**
  * Updates the recent file list in the file menu.
  */
-void QC_ApplicationWindow::updateRecentFilesMenu()
+void ApplicationWindow::updateRecentFilesMenu()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::updateRecentFilesMenu()");
+       RS_DEBUG->print("ApplicationWindow::updateRecentFilesMenu()");
        RS_DEBUG->print("Updating recent file menu...");
 
 #if 0
@@ -1570,7 +1570,7 @@ void QC_ApplicationWindow::updateRecentFilesMenu()
                }
        }
 #else
-//#warning "!!! Need to fix QC_ApplicationWindow::updateRecentFilesMenu() !!!"
+//#warning "!!! Need to fix ApplicationWindow::updateRecentFilesMenu() !!!"
        recentFiles->UpdateGUI();
 #endif
 }
@@ -1578,7 +1578,7 @@ void QC_ApplicationWindow::updateRecentFilesMenu()
 /**
  * Goes back to the previous menu or one step in the current action.
  */
-void QC_ApplicationWindow::slotBack()
+void ApplicationWindow::slotBack()
 {
        RS_GraphicView * graphicView = getGraphicView();
 
@@ -1594,7 +1594,7 @@ void QC_ApplicationWindow::slotBack()
 /**
  * Goes one step further in the current action.
  */
-void QC_ApplicationWindow::slotEnter()
+void ApplicationWindow::slotEnter()
 {
        if (commandWidget == NULL || !commandWidget->checkFocus())
        {
@@ -1613,7 +1613,7 @@ void QC_ApplicationWindow::slotEnter()
 /**
  * Sets the keyboard focus on the command line.
  */
-void QC_ApplicationWindow::slotFocusCommandLine()
+void ApplicationWindow::slotFocusCommandLine()
 {
        if (commandWidget->isVisible())
                commandWidget->setFocus();
@@ -1622,7 +1622,7 @@ void QC_ApplicationWindow::slotFocusCommandLine()
 /**
  * Shows the given error on the command line.
  */
-void QC_ApplicationWindow::slotError(const QString & msg)
+void ApplicationWindow::slotError(const QString & msg)
 {
        commandWidget->appendHistory(msg);
 }
@@ -1632,7 +1632,7 @@ void QC_ApplicationWindow::slotError(const QString & msg)
  * of a escape press from the layer widget (e.g after switching desktops
  * in XP).
  */
-void QC_ApplicationWindow::slotFocus()
+void ApplicationWindow::slotFocus()
 {
     //QG_GraphicView* graphicView = getGraphicView();
     /*if (graphicView!=NULL) {
@@ -1646,23 +1646,22 @@ void QC_ApplicationWindow::slotFocus()
 /**
  * Called when a document window was activated.
  */
-//void QC_ApplicationWindow::slotWindowActivated(QWidget *)
-void QC_ApplicationWindow::slotWindowActivated(QMdiSubWindow * /*w*/)
+void ApplicationWindow::slotWindowActivated(QMdiSubWindow * /*w*/)
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotWindowActivated begin");
+       RS_DEBUG->print("ApplicationWindow::slotWindowActivated begin");
 
-//the following does: return (QC_MDIWindow *)workspace->activeSubWindow();
+//the following does: return (MDIWindow *)workspace->activeSubWindow();
 //which means the subwindow is NOT being activated!!!
-       QC_MDIWindow * m = getMDIWindow();
-       RS_DEBUG->print(/*RS_Debug::D_CRITICAL,*/ "QC_ApplicationWindow::slotWindowActivated m=%08X", m);
+       MDIWindow * m = getMDIWindow();
+       RS_DEBUG->print(/*RS_Debug::D_CRITICAL,*/ "ApplicationWindow::slotWindowActivated m=%08X", m);
        if (m)
-               RS_DEBUG->print(/*RS_Debug::D_CRITICAL,*/ "QC_ApplicationWindow::slotWindowActivated m->getDoc=%08X", m->getDocument());
+               RS_DEBUG->print(/*RS_Debug::D_CRITICAL,*/ "ApplicationWindow::slotWindowActivated m->getDoc=%08X", m->getDocument());
 
        if (m != NULL && m->getDocument() != NULL)
        {
                //m->setWindowState(WindowMaximized);
 
-               RS_DEBUG->print("QC_ApplicationWindow::slotWindowActivated: document: %d", m->getDocument()->getId());
+               RS_DEBUG->print("ApplicationWindow::slotWindowActivated: document: %d", m->getDocument()->getId());
 
                bool showByBlock = m->getDocument()->rtti() == RS2::EntityBlock;
                layerWidget->setLayerList(m->getDocument()->getLayerList(), showByBlock);
@@ -1701,16 +1700,16 @@ void QC_ApplicationWindow::slotWindowActivated(QMdiSubWindow * /*w*/)
        // Disable/Enable menu and toolbar items
        emit windowsChanged(m != NULL && m->getDocument() != NULL);
 
-       RS_DEBUG->print("QC_ApplicationWindow::slotWindowActivated end");
+       RS_DEBUG->print("ApplicationWindow::slotWindowActivated end");
 }
 
 /**
  * Called when the menu 'windows' is about to be shown.
  * This is used to update the window list in the menu.
  */
-void QC_ApplicationWindow::slotWindowsMenuAboutToShow()
+void ApplicationWindow::slotWindowsMenuAboutToShow()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotWindowsMenuAboutToShow");
+       RS_DEBUG->print("ApplicationWindow::slotWindowsMenuAboutToShow");
 
        windowsMenu->clear();
 #if 0
@@ -1765,10 +1764,9 @@ void QC_ApplicationWindow::slotWindowsMenuAboutToShow()
  * Called when the user selects a document window from the
  * window list.
  */
-//void QC_ApplicationWindow::slotWindowsMenuActivated(int id)
-void QC_ApplicationWindow::slotWindowsMenuActivated(QAction * id)
+void ApplicationWindow::slotWindowsMenuActivated(QAction * id)
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotWindowsMenuActivated");
+       RS_DEBUG->print("ApplicationWindow::slotWindowsMenuActivated");
 
 //     QMdiSubWindow * w = workspace->subWindowList().at(id);
        QMdiSubWindow * w = workspace->subWindowList().at(id->data().toInt());
@@ -1781,9 +1779,9 @@ void QC_ApplicationWindow::slotWindowsMenuActivated(QAction * id)
 /**
  * Tiles MDI windows horizontally.
  */
-void QC_ApplicationWindow::slotTileHorizontal()
+void ApplicationWindow::slotTileHorizontal()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotTileHorizontal");
+       RS_DEBUG->print("ApplicationWindow::slotTileHorizontal");
 
 #if 0
        // primitive horizontal tiling
@@ -1824,7 +1822,7 @@ void QC_ApplicationWindow::slotTileHorizontal()
 /**
  * Tiles MDI windows vertically.
  */
-void QC_ApplicationWindow::slotTileVertical()
+void ApplicationWindow::slotTileVertical()
 {
 #if 0
        workspace->tile();
@@ -1866,7 +1864,7 @@ void QC_ApplicationWindow::slotTileVertical()
  */
 /*
 #ifdef RS_CAM
-void QC_ApplicationWindow::slotCamExportAuto() {
+void ApplicationWindow::slotCamExportAuto() {
     printf("CAM export..\n");
 
     RS_Document* d = getDocument();
@@ -1884,25 +1882,25 @@ void QC_ApplicationWindow::slotCamExportAuto() {
  * Called when something changed in the pen tool bar
  * (e.g. color, width, style).
  */
-void QC_ApplicationWindow::slotPenChanged(RS_Pen pen)
+void ApplicationWindow::slotPenChanged(RS_Pen pen)
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotPenChanged() begin");
+       RS_DEBUG->print("ApplicationWindow::slotPenChanged() begin");
        RS_DEBUG->print("Setting active pen...");
-       QC_MDIWindow * m = getMDIWindow();
+       MDIWindow * m = getMDIWindow();
 
        if (m != NULL)
                m->slotPenChanged(pen);
 
-       RS_DEBUG->print("QC_ApplicationWindow::slotPenChanged() end");
+       RS_DEBUG->print("ApplicationWindow::slotPenChanged() end");
 }
 
 /**
  * Creates a new MDI window with the given document or a new
  *  document if 'doc' is NULL.
  */
-QC_MDIWindow * QC_ApplicationWindow::slotFileNew(RS_Document * doc)
+MDIWindow * ApplicationWindow::slotFileNew(RS_Document * doc)
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotFileNew() begin");
+       RS_DEBUG->print("ApplicationWindow::slotFileNew() begin");
 
        static int id = 0;
        id++;
@@ -1911,8 +1909,8 @@ QC_MDIWindow * QC_ApplicationWindow::slotFileNew(RS_Document * doc)
 
 #warning "QWidget::setMinimumSize: (/QMdi::ControlLabel) Negative sizes (-1,-1) are not possible"
        RS_DEBUG->print("  creating MDI window");
-//     QC_MDIWindow * w = new QC_MDIWindow(doc, workspace, 0, Qt::WA_DeleteOnClose);
-       QC_MDIWindow * w = new QC_MDIWindow(doc, workspace, 0, Qt::SubWindow);
+//     MDIWindow * w = new MDIWindow(doc, workspace, 0, Qt::WA_DeleteOnClose);
+       MDIWindow * w = new MDIWindow(doc, workspace, 0, Qt::SubWindow);
        w->setAttribute(Qt::WA_DeleteOnClose);
 //     w->setWindowState(WindowMaximized);
        connect(w, SIGNAL(signalClosing()), this, SLOT(slotFileClosing()));
@@ -1957,7 +1955,7 @@ QC_MDIWindow * QC_ApplicationWindow::slotFileNew(RS_Document * doc)
        QG_DIALOGFACTORY->setMainWindow(this);
 
 #if 1 //bugfix for Qt3->4 conversion
-       RS_DEBUG->print(/*RS_Debug::D_CRITICAL,*/ "QC_ApplicationWindow::slotFileNew: adding window to workspace...");
+       RS_DEBUG->print(/*RS_Debug::D_CRITICAL,*/ "ApplicationWindow::slotFileNew: adding window to workspace...");
 //     workspace->addWindow(w);
        workspace->addSubWindow(w);
 #endif
@@ -1977,14 +1975,14 @@ QC_MDIWindow * QC_ApplicationWindow::slotFileNew(RS_Document * doc)
 //neither of these is working... Is the event being eaten somewhere???
 //     workspace->activateNextSubWindow();
 //     w->setFocus();
-//printf("--> QC_ApplicationWindow::slotFileNew(): w %s focus...\n", (w->hasFocus() ? "has" : "DOES NOT HAVE"));
+//printf("--> ApplicationWindow::slotFileNew(): w %s focus...\n", (w->hasFocus() ? "has" : "DOES NOT HAVE"));
 #endif
 
 #warning "!!! Parameter to slotWindowActivated() is ignored !!!"
        slotWindowActivated(w);
        statusBar()->showMessage(tr("New Drawing created."), 2000);
 
-       RS_DEBUG->print("QC_ApplicationWindow::slotFileNew() OK");
+       RS_DEBUG->print("ApplicationWindow::slotFileNew() OK");
        setFocus();
 
        return w;
@@ -1993,28 +1991,27 @@ QC_MDIWindow * QC_ApplicationWindow::slotFileNew(RS_Document * doc)
 /**
  * Menu file -> open.
  */
-void QC_ApplicationWindow::slotFileOpen()
+void ApplicationWindow::slotFileOpen()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotFileOpen()");
+       RS_DEBUG->print("ApplicationWindow::slotFileOpen()");
 
-       RS_DEBUG->print("QC_ApplicationWindow::slotFileOpen() 001");
+       RS_DEBUG->print("ApplicationWindow::slotFileOpen() 001");
        RS2::FormatType type = RS2::FormatUnknown;
-       RS_DEBUG->print("QC_ApplicationWindow::slotFileOpen() 002");
+       RS_DEBUG->print("ApplicationWindow::slotFileOpen() 002");
        QString fileName = QG_FileDialog::getOpenFileName(this, &type);
-       RS_DEBUG->print("QC_ApplicationWindow::slotFileOpen() 003");
+       RS_DEBUG->print("ApplicationWindow::slotFileOpen() 003");
        slotFileOpen(fileName, type);
-       RS_DEBUG->print("QC_ApplicationWindow::slotFileOpen(): OK");
+       RS_DEBUG->print("ApplicationWindow::slotFileOpen(): OK");
 }
 
 /**
  * Called when a recently opened file is chosen from the list in the
  * file menu.
  */
-//void QC_ApplicationWindow::slotFileOpenRecent(int id)
-void QC_ApplicationWindow::slotFileOpenRecent(void)
+void ApplicationWindow::slotFileOpenRecent(void)
 {
 #if 0
-       RS_DEBUG->print("QC_ApplicationWindow::slotFileOpenRecent()");
+       RS_DEBUG->print("ApplicationWindow::slotFileOpenRecent()");
 
        statusBar()->showMessage(tr("Opening recent file..."));
        QString fileName = recentFiles->get(id);
@@ -2043,22 +2040,22 @@ void QC_ApplicationWindow::slotFileOpenRecent(void)
 /**
  * Menu file -> open.
  */
-void QC_ApplicationWindow::slotFileOpen(const QString & fileName, RS2::FormatType type)
+void ApplicationWindow::slotFileOpen(const QString & fileName, RS2::FormatType type)
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotFileOpen(..)");
+       RS_DEBUG->print("ApplicationWindow::slotFileOpen(..)");
 
        QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
 
        if (!fileName.isEmpty())
        {
-               RS_DEBUG->print("QC_ApplicationWindow::slotFileOpen: creating new doc window");
+               RS_DEBUG->print("ApplicationWindow::slotFileOpen: creating new doc window");
                // Create new document window:
-               QC_MDIWindow * w = slotFileNew();
+               MDIWindow * w = slotFileNew();
 //             RS_APP->processEvents(1000);
 //Really, is this needed???
 //             RS_APP->processEvents(QEventLoop::AllEvents, 1000);
 
-               RS_DEBUG->print("QC_ApplicationWindow::slotFileOpen: linking layer list");
+               RS_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:
@@ -2070,7 +2067,7 @@ void QC_ApplicationWindow::slotFileOpen(const QString & fileName, RS2::FormatTyp
                simulationControls->setGraphicView(w->getGraphicView());
 #endif
 
-               RS_DEBUG->print("QC_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...
@@ -2088,8 +2085,8 @@ void QC_ApplicationWindow::slotFileOpen(const QString & fileName, RS2::FormatTyp
                        return;
                }
 
-               RS_DEBUG->print("QC_ApplicationWindow::slotFileOpen: open file: OK");
-               RS_DEBUG->print("QC_ApplicationWindow::slotFileOpen: update recent file menu: 1");
+               RS_DEBUG->print("ApplicationWindow::slotFileOpen: open file: OK");
+               RS_DEBUG->print("ApplicationWindow::slotFileOpen: update recent file menu: 1");
 
                // update recent files menu:
                if (type == RS2::FormatDXF1)
@@ -2097,22 +2094,22 @@ void QC_ApplicationWindow::slotFileOpen(const QString & fileName, RS2::FormatTyp
                else
                        recentFiles->add(fileName);
 
-               RS_DEBUG->print("QC_ApplicationWindow::slotFileOpen: update recent file menu: 2");
+               RS_DEBUG->print("ApplicationWindow::slotFileOpen: update recent file menu: 2");
 //             updateRecentFilesMenu();
                recentFiles->UpdateGUI();
 
-               RS_DEBUG->print("QC_ApplicationWindow::slotFileOpen: update recent file menu: OK");
+               RS_DEBUG->print("ApplicationWindow::slotFileOpen: update recent file menu: OK");
 
-               RS_DEBUG->print("QC_ApplicationWindow::slotFileOpen: set caption");
+               RS_DEBUG->print("ApplicationWindow::slotFileOpen: set caption");
                // update caption:
 //             w->setCaption(fileName);
                w->setWindowTitle(fileName);
-               RS_DEBUG->print("QC_ApplicationWindow::slotFileOpen: set caption: OK");
+               RS_DEBUG->print("ApplicationWindow::slotFileOpen: set caption: OK");
 
-               RS_DEBUG->print("QC_ApplicationWindow::slotFileOpen: update coordinate widget");
+               RS_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("QC_ApplicationWindow::slotFileOpen: update coordinate widget: OK");
+               RS_DEBUG->print("ApplicationWindow::slotFileOpen: update coordinate widget: OK");
 
                // show output of filter (if any):
 //             commandWidget->processStderr();
@@ -2126,19 +2123,19 @@ void QC_ApplicationWindow::slotFileOpen(const QString & fileName, RS2::FormatTyp
        }
 
        QApplication::restoreOverrideCursor();
-       RS_DEBUG->print("QC_ApplicationWindow::slotFileOpen(..) OK");
+       RS_DEBUG->print("ApplicationWindow::slotFileOpen(..) OK");
 }
 
 /**
  * Menu file -> save.
  */
-void QC_ApplicationWindow::slotFileSave()
+void ApplicationWindow::slotFileSave()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotFileSave()");
+       RS_DEBUG->print("ApplicationWindow::slotFileSave()");
 
        statusBar()->showMessage(tr("Saving drawing..."));
 
-       QC_MDIWindow * w = getMDIWindow();
+       MDIWindow * w = getMDIWindow();
        QString name;
 
        if (w != NULL)
@@ -2171,13 +2168,13 @@ void QC_ApplicationWindow::slotFileSave()
 /**
  * Menu file -> save as.
  */
-void QC_ApplicationWindow::slotFileSaveAs()
+void ApplicationWindow::slotFileSaveAs()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotFileSaveAs()");
+       RS_DEBUG->print("ApplicationWindow::slotFileSaveAs()");
 
        statusBar()->showMessage(tr("Saving drawing under new filename..."));
 
-       QC_MDIWindow * w = getMDIWindow();
+       MDIWindow * w = getMDIWindow();
        QString name;
 
        if (w != NULL)
@@ -2213,13 +2210,13 @@ void QC_ApplicationWindow::slotFileSaveAs()
 /**
  * Menu file -> export.
  */
-void QC_ApplicationWindow::slotFileExport()
+void ApplicationWindow::slotFileExport()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotFileExport()");
+       RS_DEBUG->print("ApplicationWindow::slotFileExport()");
 
        statusBar()->showMessage(tr("Exporting drawing..."));
 
-       QC_MDIWindow * w = getMDIWindow();
+       MDIWindow * w = getMDIWindow();
        QString fn;
 
        if (w != NULL)
@@ -2347,13 +2344,13 @@ void QC_ApplicationWindow::slotFileExport()
  * @param black true: Black background, false: white
  * @param bw true: black/white export, false: color
  */
-bool QC_ApplicationWindow::slotFileExport(const QString & name, const QString & format, QSize size, bool black, bool bw)
+bool ApplicationWindow::slotFileExport(const QString & name, const QString & format, QSize size, bool black, bool bw)
 {
-       QC_MDIWindow * w = getMDIWindow();
+       MDIWindow * w = getMDIWindow();
 
        if (w == NULL)
        {
-               RS_DEBUG->print(RS_Debug::D_WARNING, "QC_ApplicationWindow::slotFileExport: no window opened");
+               RS_DEBUG->print(RS_Debug::D_WARNING, "ApplicationWindow::slotFileExport: no window opened");
                return false;
        }
 
@@ -2361,7 +2358,7 @@ bool QC_ApplicationWindow::slotFileExport(const QString & name, const QString &
 
        if (graphic == NULL)
        {
-               RS_DEBUG->print(RS_Debug::D_WARNING, "QC_ApplicationWindow::slotFileExport: no graphic");
+               RS_DEBUG->print(RS_Debug::D_WARNING, "ApplicationWindow::slotFileExport: no graphic");
                return false;
        }
 
@@ -2438,11 +2435,11 @@ bool QC_ApplicationWindow::slotFileExport(const QString & name, const QString &
 /**
  * Menu file -> close.
  */
-void QC_ApplicationWindow::slotFileClose()
+void ApplicationWindow::slotFileClose()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotFileClose()");
+       RS_DEBUG->print("ApplicationWindow::slotFileClose()");
 
-       QC_MDIWindow * m = getMDIWindow();
+       MDIWindow * m = getMDIWindow();
 
        if (m != NULL)
 //             m->close(true);
@@ -2461,9 +2458,9 @@ void QC_ApplicationWindow::slotFileClose()
  * Called when a MDI window is actually about to close. Used to
  * detach widgets from the document.
  */
-void QC_ApplicationWindow::slotFileClosing()
+void ApplicationWindow::slotFileClosing()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotFileClosing()");
+       RS_DEBUG->print("ApplicationWindow::slotFileClosing()");
 
        RS_DEBUG->print("detaching lists");
        layerWidget->setLayerList(NULL, false);
@@ -2477,15 +2474,15 @@ void QC_ApplicationWindow::slotFileClosing()
 /**
  * Menu file -> print.
  */
-void QC_ApplicationWindow::slotFilePrint()
+void ApplicationWindow::slotFilePrint()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotFilePrint()");
+       RS_DEBUG->print("ApplicationWindow::slotFilePrint()");
 
-       QC_MDIWindow * w = getMDIWindow();
+       MDIWindow * w = getMDIWindow();
 
        if (w == NULL)
        {
-               RS_DEBUG->print(RS_Debug::D_WARNING, "QC_ApplicationWindow::slotFilePrint: no window opened");
+               RS_DEBUG->print(RS_Debug::D_WARNING, "ApplicationWindow::slotFilePrint: no window opened");
                return;
        }
 
@@ -2493,7 +2490,7 @@ void QC_ApplicationWindow::slotFilePrint()
 
        if (graphic == NULL)
        {
-               RS_DEBUG->print(RS_Debug::D_WARNING, "QC_ApplicationWindow::slotFilePrint: no graphic");
+               RS_DEBUG->print(RS_Debug::D_WARNING, "ApplicationWindow::slotFilePrint: no graphic");
                return;
        }
 
@@ -2572,27 +2569,27 @@ void QC_ApplicationWindow::slotFilePrint()
 /**
  * Menu file -> print preview.
  */
-void QC_ApplicationWindow::slotFilePrintPreview(bool on)
+void ApplicationWindow::slotFilePrintPreview(bool on)
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotFilePrintPreview()");
+       RS_DEBUG->print("ApplicationWindow::slotFilePrintPreview()");
 
        RS_DEBUG->print("  creating MDI window");
-       QC_MDIWindow * parent = getMDIWindow();
+       MDIWindow * parent = getMDIWindow();
 
        if (parent == NULL)
        {
-               RS_DEBUG->print(RS_Debug::D_WARNING, "QC_ApplicationWindow::slotFilePrintPreview: no window opened");
+               RS_DEBUG->print(RS_Debug::D_WARNING, "ApplicationWindow::slotFilePrintPreview: no window opened");
                return;
        }
 
        // close print preview:
        if (!on)
        {
-               RS_DEBUG->print("QC_ApplicationWindow::slotFilePrintPreview(): off");
+               RS_DEBUG->print("ApplicationWindow::slotFilePrintPreview(): off");
 
                if (parent->getGraphicView()->isPrintPreview())
                {
-                       RS_DEBUG->print("QC_ApplicationWindow::slotFilePrintPreview(): close");
+                       RS_DEBUG->print("ApplicationWindow::slotFilePrintPreview(): close");
                        slotFileClose();
                }
        }
@@ -2600,11 +2597,11 @@ void QC_ApplicationWindow::slotFilePrintPreview(bool on)
        else
        {
                // look for an existing print preview:
-               QC_MDIWindow * ppv = parent->getPrintPreview();
+               MDIWindow * ppv = parent->getPrintPreview();
 
                if (ppv != NULL)
                {
-                       RS_DEBUG->print("QC_ApplicationWindow::slotFilePrintPreview(): show existing");
+                       RS_DEBUG->print("ApplicationWindow::slotFilePrintPreview(): show existing");
                        slotWindowActivated(ppv);
                        ppv->showNormal();
                }
@@ -2612,9 +2609,9 @@ void QC_ApplicationWindow::slotFilePrintPreview(bool on)
                {
                        if (!parent->getGraphicView()->isPrintPreview())
                        {
-                               RS_DEBUG->print("QC_ApplicationWindow::slotFilePrintPreview(): create");
+                               RS_DEBUG->print("ApplicationWindow::slotFilePrintPreview(): create");
 
-                               QC_MDIWindow * w = new QC_MDIWindow(parent->getDocument(), workspace, 0, Qt::SubWindow);
+                               MDIWindow * w = new MDIWindow(parent->getDocument(), workspace, 0, Qt::SubWindow);
                                w->setAttribute(Qt::WA_DeleteOnClose);
                                parent->addChildWindow(w);
                                //connect(w, SIGNAL(signalClosing()),
@@ -2676,9 +2673,9 @@ void QC_ApplicationWindow::slotFilePrintPreview(bool on)
 /**
  * Menu file -> quit.
  */
-void QC_ApplicationWindow::slotFileQuit()
+void ApplicationWindow::slotFileQuit()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotFileQuit()");
+       RS_DEBUG->print("ApplicationWindow::slotFileQuit()");
 
        statusBar()->showMessage(tr("Exiting application..."));
 
@@ -2689,7 +2686,7 @@ void QC_ApplicationWindow::slotFileQuit()
 /**
  * Forces termination of QCad (demo version).
  */
-void QC_ApplicationWindow::slotFileDemoQuit()
+void ApplicationWindow::slotFileDemoQuit()
 {
        statusBar()->showMessage(tr("Exiting application..."));
 
@@ -2702,11 +2699,11 @@ void QC_ApplicationWindow::slotFileDemoQuit()
  *
  * @param toggle true: show, false: hide.
  */
-void QC_ApplicationWindow::slotViewGrid(bool toggle)
+void ApplicationWindow::slotViewGrid(bool toggle)
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotViewGrid()");
+       RS_DEBUG->print("ApplicationWindow::slotViewGrid()");
 
-       QC_MDIWindow * m = getMDIWindow();
+       MDIWindow * m = getMDIWindow();
 
        if (m != NULL)
        {
@@ -2719,7 +2716,7 @@ void QC_ApplicationWindow::slotViewGrid(bool toggle)
        updateGrids();
        redrawAll();
 
-       RS_DEBUG->print("QC_ApplicationWindow::slotViewGrid() OK");
+       RS_DEBUG->print("ApplicationWindow::slotViewGrid() OK");
 }
 
 /**
@@ -2727,11 +2724,11 @@ void QC_ApplicationWindow::slotViewGrid(bool toggle)
  *
  * @param toggle true: enable, false: disable.
  */
-void QC_ApplicationWindow::slotViewDraft(bool toggle)
+void ApplicationWindow::slotViewDraft(bool toggle)
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotViewDraft()");
+       RS_DEBUG->print("ApplicationWindow::slotViewDraft()");
 
-    /*QC_MDIWindow* m = getMDIWindow();
+    /*MDIWindow* m = getMDIWindow();
     if (m!=NULL) {
         Drawing* g = m->getGraphic();
         if (g!=NULL) {
@@ -2749,7 +2746,7 @@ void QC_ApplicationWindow::slotViewDraft(bool toggle)
 /**
  * Redraws all mdi windows.
  */
-void QC_ApplicationWindow::redrawAll()
+void ApplicationWindow::redrawAll()
 {
        if (workspace != NULL)
        {
@@ -2757,7 +2754,7 @@ void QC_ApplicationWindow::redrawAll()
 
                for(int i=0; i<int(windows.count()); ++i)
                {
-                       QC_MDIWindow * m = (QC_MDIWindow *)windows.at(i);
+                       MDIWindow * m = (MDIWindow *)windows.at(i);
 
                        if (m != NULL)
                        {
@@ -2773,7 +2770,7 @@ void QC_ApplicationWindow::redrawAll()
 /**
  * Updates all grids of all graphic views.
  */
-void QC_ApplicationWindow::updateGrids()
+void ApplicationWindow::updateGrids()
 {
        if (workspace != NULL)
        {
@@ -2781,7 +2778,7 @@ void QC_ApplicationWindow::updateGrids()
 
                for(int i=0; i<int(windows.count()); ++i)
                {
-                       QC_MDIWindow * m = (QC_MDIWindow *)windows.at(i);
+                       MDIWindow * m = (MDIWindow *)windows.at(i);
 
                        if (m != NULL)
                        {
@@ -2799,9 +2796,9 @@ void QC_ApplicationWindow::updateGrids()
  *
  * @param showSB true: show, false: hide.
  */
-void QC_ApplicationWindow::slotViewStatusBar(bool showSB)
+void ApplicationWindow::slotViewStatusBar(bool showSB)
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotViewStatusBar()");
+       RS_DEBUG->print("ApplicationWindow::slotViewStatusBar()");
 
        if (showSB)
                statusBar()->show();
@@ -2814,8 +2811,8 @@ void QC_ApplicationWindow::slotViewStatusBar(bool showSB)
  *
  * @param toggle true: show, false: hide.
  */
-/*void QC_ApplicationWindow::slotViewLayerList(bool toggle) {
-    RS_DEBUG->print("QC_ApplicationWindow::slotViewLayerList()");
+/*void ApplicationWindow::slotViewLayerList(bool toggle) {
+    RS_DEBUG->print("ApplicationWindow::slotViewLayerList()");
 
     if (toggle==false) {
         layerDockWindow->hide();
@@ -2831,8 +2828,8 @@ void QC_ApplicationWindow::slotViewStatusBar(bool showSB)
  * @param toggle true: show, false: hide.
  */
 /*
-void QC_ApplicationWindow::slotViewBlockList(bool toggle) {
-    RS_DEBUG->print("QC_ApplicationWindow::slotViewBlockList()");
+void ApplicationWindow::slotViewBlockList(bool toggle) {
+    RS_DEBUG->print("ApplicationWindow::slotViewBlockList()");
 
     if (toggle==false) {
         blockDockWindow->hide();
@@ -2848,8 +2845,8 @@ void QC_ApplicationWindow::slotViewBlockList(bool toggle) {
  * @param toggle true: show, false: hide.
  */
 /*
-void QC_ApplicationWindow::slotViewCommandLine(bool toggle) {
-    RS_DEBUG->print("QC_ApplicationWindow::slotViewCommandLine()");
+void ApplicationWindow::slotViewCommandLine(bool toggle) {
+    RS_DEBUG->print("ApplicationWindow::slotViewCommandLine()");
 
     if (toggle==false) {
         commandDockWindow->hide();
@@ -2870,8 +2867,8 @@ void QC_ApplicationWindow::slotViewCommandLine(bool toggle) {
  * @param toggle true: show, false: hide.
  */
 /*
-void QC_ApplicationWindow::slotViewOptionToolbar(bool toggle) {
-    RS_DEBUG->print("QC_ApplicationWindow::slotViewOptionToolbar()");
+void ApplicationWindow::slotViewOptionToolbar(bool toggle) {
+    RS_DEBUG->print("ApplicationWindow::slotViewOptionToolbar()");
 
     if (toggle==false) {
         optionWidget->hide();
@@ -2885,16 +2882,16 @@ void QC_ApplicationWindow::slotViewOptionToolbar(bool toggle) {
  * Creates a new MDI window for editing the selected block.
  */
 /*
-void QC_ApplicationWindow::slotBlocksEdit() {
-    RS_DEBUG->print("QC_ApplicationWindow::slotBlocksEdit()");
+void ApplicationWindow::slotBlocksEdit() {
+    RS_DEBUG->print("ApplicationWindow::slotBlocksEdit()");
 
-    QC_MDIWindow* parent = getMDIWindow();
+    MDIWindow* parent = getMDIWindow();
     if (parent!=NULL) {
         RS_BlockList* blist = blockWidget->getBlockList();
         if (blist!=NULL) {
             RS_Block* blk = blist->getActiveBlock();
             if (blk!=NULL) {
-                QC_MDIWindow* w = slotFileNew(blk);
+                MDIWindow* w = slotFileNew(blk);
                 // the parent needs a pointer to the block window and
                 //   vice versa
                 parent->addChildWindow(w);
@@ -2908,7 +2905,7 @@ void QC_ApplicationWindow::slotBlocksEdit() {
 /**
  * Shows the dialog for general application preferences.
  */
-void QC_ApplicationWindow::slotOptionsGeneral()
+void ApplicationWindow::slotOptionsGeneral()
 {
        RS_DIALOGFACTORY->requestOptionsGeneralDialog();
 
@@ -2925,7 +2922,7 @@ void QC_ApplicationWindow::slotOptionsGeneral()
 
        for(int i=0; i<int(windows.count()); ++i)
        {
-               QC_MDIWindow * m = (QC_MDIWindow *)windows.at(i);
+               MDIWindow * m = (MDIWindow *)windows.at(i);
 
                if (m != NULL)
                {
@@ -2948,7 +2945,7 @@ void QC_ApplicationWindow::slotOptionsGeneral()
 /**
  * Menu script -> show ide
  */
-void QC_ApplicationWindow::slotScriptOpenIDE()
+void ApplicationWindow::slotScriptOpenIDE()
 {
 #ifdef RS_SCRIPTING
        scripter->openIDE();
@@ -2958,7 +2955,7 @@ void QC_ApplicationWindow::slotScriptOpenIDE()
 /**
  * Menu script -> run
  */
-void QC_ApplicationWindow::slotScriptRun()
+void ApplicationWindow::slotScriptRun()
 {
 #ifdef RS_SCRIPTING
        scripter->runScript();
@@ -2968,9 +2965,9 @@ void QC_ApplicationWindow::slotScriptRun()
 /**
  * Menu help -> about.
  */
-void QC_ApplicationWindow::slotHelpAbout()
+void ApplicationWindow::slotHelpAbout()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotHelpAbout()");
+       RS_DEBUG->print("ApplicationWindow::slotHelpAbout()");
        QStringList modules;
 
 #ifdef RS_CAM
@@ -3019,16 +3016,16 @@ void QC_ApplicationWindow::slotHelpAbout()
 /**
  * Menu help -> help.
  */
-void QC_ApplicationWindow::slotHelpManual()
+void ApplicationWindow::slotHelpManual()
 {
 #warning "No help system ported to Qt4... !!! FIX !!!"
 #if 0
-    RS_DEBUG->print("QC_ApplicationWindow::slotHelpManual()");
+    RS_DEBUG->print("ApplicationWindow::slotHelpManual()");
 
     if (assistant == NULL)
        {
-        RS_DEBUG->print("QC_ApplicationWindow::slotHelpManual(): appdir: %s", RS_SYSTEM->getAppDir().toLatin1().data());
-        RS_DEBUG->print("QC_ApplicationWindow::slotHelpManual(): appdir: %s", RS_SYSTEM->getAppDir().toLatin1().data());
+        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);
                connect(assistant, SIGNAL(error(const QString&)), this, SLOT(slotError(const QString&)));
         QStringList args;
@@ -3048,9 +3045,9 @@ void QC_ApplicationWindow::slotHelpManual()
 /**
  * Testing function.
  */
-void QC_ApplicationWindow::slotTestDumpEntities(RS_EntityContainer * d)
+void ApplicationWindow::slotTestDumpEntities(RS_EntityContainer * d)
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotTestDumpEntities()");
+       RS_DEBUG->print("ApplicationWindow::slotTestDumpEntities()");
        static int level = 0;
        std::ofstream dumpFile;
 
@@ -3334,9 +3331,9 @@ void QC_ApplicationWindow::slotTestDumpEntities(RS_EntityContainer * d)
 /**
  * Testing function.
  */
-void QC_ApplicationWindow::slotTestDumpUndo()
+void ApplicationWindow::slotTestDumpUndo()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotTestDumpUndo()");
+       RS_DEBUG->print("ApplicationWindow::slotTestDumpUndo()");
 
        RS_Document * d = getDocument();
 
@@ -3350,9 +3347,9 @@ void QC_ApplicationWindow::slotTestDumpUndo()
 /**
  * Testing function.
  */
-void QC_ApplicationWindow::slotTestUpdateInserts()
+void ApplicationWindow::slotTestUpdateInserts()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotTestUpdateInserts()");
+       RS_DEBUG->print("ApplicationWindow::slotTestUpdateInserts()");
 
        RS_Document * d = getDocument();
 
@@ -3363,9 +3360,9 @@ void QC_ApplicationWindow::slotTestUpdateInserts()
 /**
  * Testing function.
  */
-void QC_ApplicationWindow::slotTestDrawFreehand()
+void ApplicationWindow::slotTestDrawFreehand()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotTestDrawFreehand()");
+       RS_DEBUG->print("ApplicationWindow::slotTestDrawFreehand()");
 
     //Drawing* g = document->getMarking();
     /*
@@ -3420,9 +3417,9 @@ void QC_ApplicationWindow::slotTestDrawFreehand()
 /**
  * Testing function.
  */
-void QC_ApplicationWindow::slotTestInsertBlock()
+void ApplicationWindow::slotTestInsertBlock()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotTestInsertBlock()");
+       RS_DEBUG->print("ApplicationWindow::slotTestInsertBlock()");
 
        RS_Document * d = getDocument();
 
@@ -3521,9 +3518,9 @@ void QC_ApplicationWindow::slotTestInsertBlock()
 /**
  * Testing function.
  */
-void QC_ApplicationWindow::slotTestInsertEllipse()
+void ApplicationWindow::slotTestInsertEllipse()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotTestInsertEllipse()");
+       RS_DEBUG->print("ApplicationWindow::slotTestInsertEllipse()");
 
        RS_Document * d = getDocument();
 
@@ -3663,9 +3660,9 @@ void QC_ApplicationWindow::slotTestInsertEllipse()
 /**
  * Testing function.
  */
-void QC_ApplicationWindow::slotTestInsertText()
+void ApplicationWindow::slotTestInsertText()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotTestInsertText()");
+       RS_DEBUG->print("ApplicationWindow::slotTestInsertText()");
 
        RS_Document * d = getDocument();
 
@@ -3766,9 +3763,9 @@ void QC_ApplicationWindow::slotTestInsertText()
 /**
  * Testing function.
  */
-void QC_ApplicationWindow::slotTestInsertImage()
+void ApplicationWindow::slotTestInsertImage()
 {
-       RS_DEBUG->print("QC_ApplicationWindow::slotTestInsertImage()");
+       RS_DEBUG->print("ApplicationWindow::slotTestInsertImage()");
 
        RS_Document * d = getDocument();
 
@@ -3794,9 +3791,9 @@ void QC_ApplicationWindow::slotTestInsertImage()
 /**
  * Testing function.
  */
-void QC_ApplicationWindow::slotTestUnicode()
+void ApplicationWindow::slotTestUnicode()
 {
-    RS_DEBUG->print("QC_ApplicationWindow::slotTestUnicode()");
+    RS_DEBUG->print("ApplicationWindow::slotTestUnicode()");
 
     slotFileOpen("./fonts/unicode.cxf", RS2::FormatCXF);
     RS_Document* d = getDocument();
@@ -3853,9 +3850,9 @@ void QC_ApplicationWindow::slotTestUnicode()
 /**
  * Testing function.
  */
-void QC_ApplicationWindow::slotTestMath01()
+void ApplicationWindow::slotTestMath01()
 {
-    RS_DEBUG->print("QC_ApplicationWindow::slotTestMath01()");
+    RS_DEBUG->print("ApplicationWindow::slotTestMath01()");
 
     RS_Document* d = getDocument();
     if (d!=NULL) {
@@ -3915,9 +3912,9 @@ void QC_ApplicationWindow::slotTestMath01()
 /**
  * Testing function.
  */
-void QC_ApplicationWindow::slotTestResize640()
+void ApplicationWindow::slotTestResize640()
 {
-    RS_DEBUG->print("QC_ApplicationWindow::slotTestResize640()");
+    RS_DEBUG->print("ApplicationWindow::slotTestResize640()");
 
     resize(640, 480);
 }
@@ -3925,9 +3922,9 @@ void QC_ApplicationWindow::slotTestResize640()
 /**
  * Testing function.
  */
-void QC_ApplicationWindow::slotTestResize800()
+void ApplicationWindow::slotTestResize800()
 {
-    RS_DEBUG->print("QC_ApplicationWindow::slotTestResize800()");
+    RS_DEBUG->print("ApplicationWindow::slotTestResize800()");
 
     resize(800, 600);
 }
@@ -3935,9 +3932,9 @@ void QC_ApplicationWindow::slotTestResize800()
 /**
  * Testing function.
  */
-void QC_ApplicationWindow::slotTestResize1024()
+void ApplicationWindow::slotTestResize1024()
 {
-    RS_DEBUG->print("QC_ApplicationWindow::slotTestResize1024()");
+    RS_DEBUG->print("ApplicationWindow::slotTestResize1024()");
 
     resize(1024, 768);
 }
@@ -3945,9 +3942,9 @@ void QC_ApplicationWindow::slotTestResize1024()
 /**
  * overloaded for Message box on last window exit.
  */
-bool QC_ApplicationWindow::queryExit(bool force)
+bool ApplicationWindow::queryExit(bool force)
 {
-       RS_DEBUG->print("QC_ApplicationWindow::queryExit()");
+       RS_DEBUG->print("ApplicationWindow::queryExit()");
 
        bool succ = true;
 
@@ -3976,7 +3973,7 @@ bool QC_ApplicationWindow::queryExit(bool force)
 //     for(QWidget * w=list.first(); w!=NULL; w=list.next())
        for(int i=0; i<list.size(); i++)
        {
-               succ = ((QC_MDIWindow *)list[i])->closeMDI(force);
+               succ = ((MDIWindow *)list[i])->closeMDI(force);
 
                if (!succ)
                        break;
@@ -3985,7 +3982,7 @@ bool QC_ApplicationWindow::queryExit(bool force)
        if (succ)
                storeSettings();
 
-       RS_DEBUG->print("QC_ApplicationWindow::queryExit(): OK");
+       RS_DEBUG->print("ApplicationWindow::queryExit(): OK");
 
        return succ;
 }
@@ -3995,7 +3992,7 @@ bool QC_ApplicationWindow::queryExit(bool force)
  * it will consume them also if a text field is active
  * which means it's impossible to enter a command.
  */
-void QC_ApplicationWindow::keyPressEvent(QKeyEvent * e)
+void ApplicationWindow::keyPressEvent(QKeyEvent * e)
 {
        // timer
        static QTime ts = QTime();
@@ -4090,7 +4087,7 @@ void QC_ApplicationWindow::keyPressEvent(QKeyEvent * e)
        QMainWindow::keyPressEvent(e);
 }
 
-void QC_ApplicationWindow::keyReleaseEvent(QKeyEvent * e)
+void ApplicationWindow::keyReleaseEvent(QKeyEvent * e)
 {
        switch (e->key())
        {
@@ -4121,7 +4118,7 @@ void QC_ApplicationWindow::keyReleaseEvent(QKeyEvent * e)
 /**
  * @return Pointer to application window.
  */
-/*static*/ QC_ApplicationWindow * QC_ApplicationWindow::getAppWindow()
+/*static*/ ApplicationWindow * ApplicationWindow::getAppWindow()
 {
        return appWindow;
 }
@@ -4129,7 +4126,7 @@ void QC_ApplicationWindow::keyReleaseEvent(QKeyEvent * e)
 /**
  * @return Pointer to workspace.
  */
-QMdiArea * QC_ApplicationWindow::getWorkspace()
+QMdiArea * ApplicationWindow::getWorkspace()
 {
        return workspace;
 }
@@ -4138,17 +4135,17 @@ QMdiArea * QC_ApplicationWindow::getWorkspace()
  * @return Pointer to the currently active MDI Window or NULL if no
  * MDI Window is active.
  */
-QC_MDIWindow * QC_ApplicationWindow::getMDIWindow()
+MDIWindow * ApplicationWindow::getMDIWindow()
 {
-       RS_DEBUG->print(/*RS_Debug::D_CRITICAL,*/ "QC_ApplicationWindow::getMDIWindow: workspace=%08X", workspace);
+       RS_DEBUG->print(/*RS_Debug::D_CRITICAL,*/ "ApplicationWindow::getMDIWindow: workspace=%08X", workspace);
 
        if (workspace != NULL)
        {
-               RS_DEBUG->print("QC_ApplicationWindow::getMDIWindow: activeSubWindow=%08X", workspace->activeSubWindow());
-               return (QC_MDIWindow *)workspace->activeSubWindow();
+               RS_DEBUG->print("ApplicationWindow::getMDIWindow: activeSubWindow=%08X", workspace->activeSubWindow());
+               return (MDIWindow *)workspace->activeSubWindow();
        }
 
-       RS_DEBUG->print("QC_ApplicationWindow::getMDIWindow: activeSubWindow=??? (workspace == NULL)");
+       RS_DEBUG->print("ApplicationWindow::getMDIWindow: activeSubWindow=??? (workspace == NULL)");
        return NULL;
 }
 
@@ -4158,9 +4155,9 @@ QC_MDIWindow * QC_ApplicationWindow::getMDIWindow()
  * @return Pointer to the graphic view of the currently active document
  * window or NULL if no window is available.
  */
-/*virtual*/ RS_GraphicView * QC_ApplicationWindow::getGraphicView()
+/*virtual*/ RS_GraphicView * ApplicationWindow::getGraphicView()
 {
-       QC_MDIWindow * m = getMDIWindow();
+       MDIWindow * m = getMDIWindow();
 
        if (m != NULL)
                return m->getGraphicView();
@@ -4174,9 +4171,9 @@ QC_MDIWindow * QC_ApplicationWindow::getMDIWindow()
  * @return Pointer to the graphic document of the currently active document
  * window or NULL if no window is available.
  */
-/*virtual*/ RS_Document * QC_ApplicationWindow::getDocument()
+/*virtual*/ RS_Document * ApplicationWindow::getDocument()
 {
-       QC_MDIWindow * m = getMDIWindow();
+       MDIWindow * m = getMDIWindow();
 
        if (m != NULL)
                return m->getDocument();
@@ -4187,7 +4184,7 @@ QC_MDIWindow * QC_ApplicationWindow::getMDIWindow()
 /**
  * Creates a new document. Implementation from RS_MainWindowInterface.
  */
-/*virtual*/ void QC_ApplicationWindow::createNewDocument(const QString & fileName/*= QString::null*/,
+/*virtual*/ void ApplicationWindow::createNewDocument(const QString & fileName/*= QString::null*/,
        RS_Document * doc/*= NULL*/)
 {
        slotFileNew(doc);
@@ -4201,8 +4198,7 @@ QC_MDIWindow * QC_ApplicationWindow::getMDIWindow()
  *
  * @return Pointer to this.
  */
-// /*virtual*/ Q3MainWindow * QC_ApplicationWindow::GetMainWindow()
-/*virtual*/ QMainWindow * QC_ApplicationWindow::GetMainWindow()
+/*virtual*/ QMainWindow * ApplicationWindow::GetMainWindow()
 {
        return this;
 }
@@ -4210,7 +4206,7 @@ QC_MDIWindow * QC_ApplicationWindow::getMDIWindow()
 /**
  * @return Pointer to action handler. Implementation from QG_MainWindowInterface.
  */
-/*virtual*/ QG_ActionHandler * QC_ApplicationWindow::getActionHandler()
+/*virtual*/ QG_ActionHandler * ApplicationWindow::getActionHandler()
 {
        return actionHandler;
 }
@@ -4218,7 +4214,7 @@ QC_MDIWindow * QC_ApplicationWindow::getMDIWindow()
 /**
  * Implementation from QG_MainWindowInterface.
  */
-/*virtual*/ void QC_ApplicationWindow::showSimulationControls()
+/*virtual*/ void ApplicationWindow::showSimulationControls()
 {
 #ifdef RS_CAM
        simulationDockWindow->show();
@@ -4229,7 +4225,7 @@ QC_MDIWindow * QC_ApplicationWindow::getMDIWindow()
 /**
  * @return Pointer to the qsa object.
  */
-QSProject * QC_ApplicationWindow::getQSAProject()
+QSProject * ApplicationWindow::getQSAProject()
 {
        if (scripter != NULL)
                return scripter->getQSAProject();
@@ -4241,7 +4237,7 @@ QSProject * QC_ApplicationWindow::getQSAProject()
 /**
  * Implementation from QG_MainWindowInterface.
  */
-/*virtual*/ void QC_ApplicationWindow::setFocus2()
+/*virtual*/ void ApplicationWindow::setFocus2()
 {
        setFocus();
 }