Sanity check stage II: rename classes...

[architektonas] / src / mainapp / applicationwindow.cpp

diff --git a/src/mainapp/applicationwindow.cpp b/src/mainapp/applicationwindow.cpp
index 42c90ccc72190f1325e2832dd608fe06b5a61449..22580a043e344ce1b0a537721bc9fe9974ee6c44 100644 (file)
--- a/src/mainapp/applicationwindow.cpp
+++ b/src/mainapp/applicationwindow.cpp
@@ -47,9 +47,9 @@
 #include "rs_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"
@@ -95,7 +95,7 @@ ApplicationWindow::ApplicationWindow():
        CreateQtActions(this);
 
        RS_DEBUG->print("ApplicationWindow::ApplicationWindow: creating action handler");
-       actionHandler = new QG_ActionHandler(this);
+       actionHandler = new ActionHandler(this);
        RS_DEBUG->print("ApplicationWindow::ApplicationWindow: creating action handler: OK");
 
 #ifdef RS_SCRIPTING
@@ -1285,7 +1285,7 @@ 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)));
@@ -1450,7 +1450,7 @@ void ApplicationWindow::initView()
 //     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)));
@@ -1467,7 +1467,7 @@ void ApplicationWindow::initView()
 //     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)));
@@ -1973,7 +1973,7 @@ void ApplicationWindow::slotFileOpen()
        RS_DEBUG->print("ApplicationWindow::slotFileOpen() 001");
        RS2::FormatType type = RS2::FormatUnknown;
        RS_DEBUG->print("ApplicationWindow::slotFileOpen() 002");
-       QString fileName = QG_FileDialog::getOpenFileName(this, &type);
+       QString fileName = FileDialog::getOpenFileName(this, &type);
        RS_DEBUG->print("ApplicationWindow::slotFileOpen() 003");
        slotFileOpen(fileName, type);
        RS_DEBUG->print("ApplicationWindow::slotFileOpen(): OK");
@@ -4177,7 +4177,7 @@ MDIWindow * ApplicationWindow::getMDIWindow()
 /**
  * @return Pointer to action handler. Implementation from QG_MainWindowInterface.
  */
-/*virtual*/ QG_ActionHandler * ApplicationWindow::getActionHandler()
+/*virtual*/ ActionHandler * ApplicationWindow::getActionHandler()
 {
        return actionHandler;
 }