X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmainapp%2Fmain.cpp;h=72eac0e96f335bfe51968eaa6aa566569330d86f;hb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;hp=3c0a154addb8199b70feae5b6beafe8c445d8580;hpb=16ce54abf01ca3032e42a5bb11a4afcf9014dcca;p=architektonas

diff --git a/src/mainapp/main.cpp b/src/mainapp/main.cpp
index 3c0a154..72eac0e 100644
--- a/src/mainapp/main.cpp
+++ b/src/mainapp/main.cpp
@@ -3,7 +3,9 @@
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // Extensively rewritten and refactored by James L. Hammons
-// (C) 2010 Underground Software
+// Portions copyright (C) 2001-2003 RibbonSoft
+// Copyright (C) 2010 Underground Software
+// See the README and GPLv2 files for licensing and warranty information
 //
 // JLH = James L. Hammons <jlhamm@acm.org>
 //
@@ -26,23 +28,23 @@ QSplashScreen * splash = 0;
 #include <qsproject.h>
 #endif
 
-#include "rs_fontlist.h"
-#include "rs_patternlist.h"
-#include "rs_scriptlist.h"
+#include "fontlist.h"
+#include "patternlist.h"
+#include "scriptlist.h"
 #include "settings.h"
-#include "rs_system.h"
-#include "rs_fileio.h"
-#include "rs_filtercxf.h"
-#include "rs_filterdxf.h"
-#include "rs_filterdxf1.h"
+#include "system.h"
+#include "fileio.h"
+#include "filtercxf.h"
+#include "filterdxf.h"
+#include "filterdxf1.h"
 
 #include "dlginitial.h"
 
-#include "qc_applicationwindow.h"
+#include "applicationwindow.h"
 
 #ifdef RS_CAM
-# include "rs_filtercam.h"
-# include "rs_camdialog.h"
+# include "filtercam.h"
+# include "camdialog.h"
 #endif
 
 //#ifdef RS_CAM
@@ -145,7 +147,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 +219,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 +369,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);