In the middle of chasing down MDI not activating bug, renaming of Graphic to

[architektonas] / src / mainapp / main.cpp

diff --git a/src/mainapp/main.cpp b/src/mainapp/main.cpp
index c205e292d476b6185f5244e0f50a5a32c8d03b4f..5d5776981c33fd0e19b1764e5ca582d0994c970c 100644 (file)
--- a/src/mainapp/main.cpp
+++ b/src/mainapp/main.cpp
@@ -47,16 +47,6 @@ QSplashScreen * splash = 0;
 # include "camdialog.h"
 #endif
 
-//#ifdef RS_CAM
-//# include "xpm/intro_camexpert.xpm"
-//# include "xpm/splash_camexpert.xpm"
-//#else
-//# include "xpm/intro_qcad.xpm"
-//# ifndef QC_CUSTOM_SPLASH
-//#  include "xpm/splash_qcad.xpm"
-//# endif
-//#endif
-
 #ifndef QC_SPLASH_TXTCOL
 # define QC_SPLASH_TXTCOL Qt::black
 #endif
@@ -116,7 +106,7 @@ int main(int argc, char * argv[])
 #endif
     settings.endGroup();
 
-       // show initial config dialog:
+       // Show initial config dialog if necessary:
        if (unit == "Invalid")
        {
                DEBUG->print("main: show initial config dialog..");
@@ -126,8 +116,6 @@ int main(int argc, char * argv[])
                "Please choose the unit you want to use for new drawings and your "
                "preferred language.<br>"
                "You can changes these settings later in the Options Dialog of Architektonas.");
-//             QPixmap pxm(":/res/intro.xpm");
-//             di.setPixmap(pxm);
                di.setPixmap(QPixmap(":/res/intro.xpm"));
 
                if (di.exec())
@@ -143,21 +131,7 @@ int main(int argc, char * argv[])
 #ifdef QSPLASHSCREEN_H
        DEBUG->print("main: splashscreen..");
 
-//# ifdef QC_CUSTOM_SPLASH
-//     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.png");
-//# endif
-
-/*
-       splash = new QSplashScreen(*pixmap);
-       splash->show();
-       splash->message(app.tr("Loading.."),
-               Qt::AlignRight|Qt::AlignBottom, QC_SPLASH_TXTCOL);
-       DEBUG->print("main: splashscreen: OK");
-*/
 #endif
 
        DEBUG->print("main: init fontlist..");
@@ -243,7 +217,7 @@ int main(int argc, char * argv[])
 
        // loading files:
        DEBUG->print("main: loading files..");
-       bool files_loaded = false;
+       bool filesLoaded = false;
 
        for(QStringList::Iterator it=fileList.begin(); it!=fileList.end(); ++it)
        {
@@ -257,16 +231,11 @@ int main(int argc, char * argv[])
                }
 #endif
                        appWin->slotFileOpen(*it, RS2::FormatUnknown);
-                       files_loaded = true;
+                       filesLoaded = true;
        }
 
        DEBUG->print("main: loading files: OK");
 
-//none of this demo shit
-//#ifdef RS_DEMO
-//     QTimer::singleShot(10 * 60 * 1000, appWin, SLOT(slotFileDemoQuit()));
-//#endif
-
 #ifdef QSPLASHSCREEN_H
 # ifndef QC_DELAYED_SPLASH_SCREEN
        if (splash)
@@ -279,15 +248,13 @@ int main(int argc, char * argv[])
        delete pixmap;
 #endif
 
-    //app.connect(&app, SIGNAL(lastWindowClosed()), &app, SLOT(quit()));
-
        // renew: avoid . / , confusion on German environments
        //setlocale(LC_NUMERIC, "C");
        setlocale(LC_ALL, "C");
 
        DEBUG->print("main: app.exec()");
 
-       if (!files_loaded)
+       if (!filesLoaded)
                appWin->slotFileNew();
 
        appWin->slotRunStartScript();