In the middle of major refactoring...

[architektonas] / src / mainapp / main.cpp

diff --git a/src/mainapp/main.cpp b/src/mainapp/main.cpp
index 3c0a154addb8199b70feae5b6beafe8c445d8580..9e7bc7ef51464e7902e0b1f7786a461afd8b1771 100644 (file)
--- a/src/mainapp/main.cpp
+++ b/src/mainapp/main.cpp
@@ -38,7 +38,7 @@ QSplashScreen * splash = 0;
 
 #include "dlginitial.h"
 
-#include "qc_applicationwindow.h"
+#include "applicationwindow.h"
 
 #ifdef RS_CAM
 # include "rs_filtercam.h"
@@ -145,7 +145,8 @@ int main(int argc, char * argv[])
 //     QPixmap * pixmap = new QPixmap(qPixmapFromMimeSource(QC_CUSTOM_SPLASH));
 //# else
 ////   QPixmap * pixmap = new QPixmap(":/res/splash.xpm");
-       QPixmap * pixmap = new QPixmap(":/res/splash_qcad.xpm");
+//     QPixmap * pixmap = new QPixmap(":/res/splash_qcad.xpm");
+       QPixmap * pixmap = new QPixmap(":/res/splash.png");
 //# endif
 
 /*
@@ -216,7 +217,7 @@ int main(int argc, char * argv[])
 #endif
 
        RS_DEBUG->print("main: creating main window..");
-    QC_ApplicationWindow * appWin = new QC_ApplicationWindow();
+    ApplicationWindow * appWin = new ApplicationWindow();
        RS_DEBUG->print("main: setting caption");
     appWin->setWindowTitle("Architektonas");
        RS_DEBUG->print("main: show main window");
@@ -366,7 +367,7 @@ QStringList handleArgs(int argc, char * argv[])
        if (machine.isEmpty() == false && input.isEmpty() == false && output.isEmpty() == false)
        {
                RS_FilterCAM fc;
-               RS_Graphic gr;
+               Drawing gr;
                RS_FILEIO->fileImport(gr, input, RS2::FormatUnknown);
                RS_CamDialog dlg(gr, NULL);
                dlg.activateMachineGenerator(machine);