Bugfixes related to removing Snapper class.

[architektonas] / src / forms / dlginitial.cpp

diff --git a/src/forms/dlginitial.cpp b/src/forms/dlginitial.cpp
index 6bf6ff87cac9405331224c437d13bbcd03858850..f25d33c234b4f5ec1be3239db903411ca2ec5119 100644 (file)
--- a/src/forms/dlginitial.cpp
+++ b/src/forms/dlginitial.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>
 //
@@ -14,10 +16,10 @@
 
 #include "dlginitial.h"
 
-#include "rs.h"
+#include "enums.h"
 #include "settings.h"
-#include "rs_system.h"
-#include "rs_units.h"
+#include "system.h"
+#include "units.h"
 
 DlgInitial::DlgInitial(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/):
        QDialog(parent, flags)
@@ -25,11 +27,11 @@ DlgInitial::DlgInitial(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/)
        ui.setupUi(this);
 
        // Fill combobox with languages:
-       QStringList languageList = RS_SYSTEM->getLanguageList();
+       QStringList languageList = SYSTEM->getLanguageList();
 
        for(QStringList::Iterator it=languageList.begin(); it!=languageList.end(); it++)
        {
-               QString l = RS_SYSTEM->symbolToLanguage(*it);
+               QString l = SYSTEM->symbolToLanguage(*it);
 //             ui.cbLanguage->insertItem(l);
 //             ui.cbLanguageCmd->insertItem(l);
                ui.cbLanguage->addItem(l);
@@ -38,8 +40,8 @@ DlgInitial::DlgInitial(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/)
 
        // units:
        for(int i=RS2::None; i<RS2::LastUnit; i++)
-//             ui.cbUnit->insertItem(RS_Units::unitToString((RS2::Unit)i));
-               ui.cbUnit->addItem(RS_Units::unitToString((RS2::Unit)i));
+//             ui.cbUnit->insertItem(Units::unitToString((RS2::Unit)i));
+               ui.cbUnit->addItem(Units::unitToString((RS2::Unit)i));
 
 //     ui.cbUnit->setCurrentText("Millimeter");
 //     ui.cbLanguage->setCurrentText("English");
@@ -66,8 +68,8 @@ void DlgInitial::setPixmap(const QPixmap & p)
 void DlgInitial::ok()
 {
        settings.beginGroup("Appearance");
-       settings.setValue("Language", RS_SYSTEM->languageToSymbol(ui.cbLanguage->currentText()));
-       settings.setValue("LanguageCmd", RS_SYSTEM->languageToSymbol(ui.cbLanguageCmd->currentText()));
+       settings.setValue("Language", SYSTEM->languageToSymbol(ui.cbLanguage->currentText()));
+       settings.setValue("LanguageCmd", SYSTEM->languageToSymbol(ui.cbLanguageCmd->currentText()));
        settings.endGroup();
 
        settings.beginGroup("Defaults");