Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / forms / dlgoptionsgeneral.cpp

diff --git a/src/forms/dlgoptionsgeneral.cpp b/src/forms/dlgoptionsgeneral.cpp
index 03f45521cfac7323b5b9a7deb089fa9b16fb8f32..ae827ba1d25da6647296e22a0ce8f0979cffa948 100644 (file)
--- a/src/forms/dlgoptionsgeneral.cpp
+++ b/src/forms/dlgoptionsgeneral.cpp
@@ -16,7 +16,7 @@
 
 #include "dlgoptionsgeneral.h"
 
-#include "rs.h"
+#include "enums.h"
 #include "debug.h"
 #include "settings.h"
 #include "system.h"
@@ -32,18 +32,18 @@ DlgOptionsGeneral::DlgOptionsGeneral(QWidget * parent/*= 0*/, Qt::WindowFlags fl
        Widget9Layout->addMultiCellWidget(bgGraphicView, 0, 2, 0, 0); //use empty space as well
 #endif
        // Fill combobox with languages:
-       QStringList languageList = RS_SYSTEM->getLanguageList();
+       QStringList languageList = SYSTEM->getLanguageList();
        languageList.prepend("en");
 
        for(QStringList::Iterator it=languageList.begin(); it!=languageList.end(); it++)
        {
-               RS_DEBUG->print("DlgOptionsGeneral::init: adding %s to combobox", (*it).toLatin1().data());
+               DEBUG->print("DlgOptionsGeneral::init: adding %s to combobox", (*it).toLatin1().data());
 
-               QString l = RS_SYSTEM->symbolToLanguage(*it);
+               QString l = SYSTEM->symbolToLanguage(*it);
 
                if (l.isEmpty() == false)
                {
-                       RS_DEBUG->print("DlgOptionsGeneral::init: %s", l.toLatin1().data());
+                       DEBUG->print("DlgOptionsGeneral::init: %s", l.toLatin1().data());
                        ui.cbLanguage->addItem(l);
                        ui.cbLanguageCmd->addItem(l);
                }
@@ -57,12 +57,12 @@ DlgOptionsGeneral::DlgOptionsGeneral(QWidget * parent/*= 0*/, Qt::WindowFlags fl
        def_lang = QC_PREDEFINED_LOCALE;
 #endif
        QString lang = settings.value("Language", def_lang).toString();
-//     ui.cbLanguage->setCurrentText(RS_SYSTEM->symbolToLanguage(lang));
-       ui.cbLanguage->setItemText(ui.cbLanguage->currentIndex(), RS_SYSTEM->symbolToLanguage(lang));
+//     ui.cbLanguage->setCurrentText(SYSTEM->symbolToLanguage(lang));
+       ui.cbLanguage->setItemText(ui.cbLanguage->currentIndex(), SYSTEM->symbolToLanguage(lang));
 
        QString langCmd = settings.value("LanguageCmd", def_lang).toString();
-//     ui.cbLanguageCmd->setCurrentText(RS_SYSTEM->symbolToLanguage(langCmd));
-       ui.cbLanguageCmd->setItemText(ui.cbLanguageCmd->currentIndex(), RS_SYSTEM->symbolToLanguage(langCmd));
+//     ui.cbLanguageCmd->setCurrentText(SYSTEM->symbolToLanguage(langCmd));
+       ui.cbLanguageCmd->setItemText(ui.cbLanguageCmd->currentIndex(), SYSTEM->symbolToLanguage(langCmd));
 
        // graphic view:
        // crosshairs:
@@ -119,7 +119,7 @@ DlgOptionsGeneral::DlgOptionsGeneral(QWidget * parent/*= 0*/, Qt::WindowFlags fl
        for(int i=RS2::None; i<RS2::LastUnit; i++)
        {
                if (i != (int)RS2::None)
-                       ui.cbUnit->addItem(RS_Units::unitToString((RS2::Unit)i));
+                       ui.cbUnit->addItem(Units::unitToString((RS2::Unit)i));
        }
 
 //should be [DONE]
@@ -128,7 +128,7 @@ DlgOptionsGeneral::DlgOptionsGeneral(QWidget * parent/*= 0*/, Qt::WindowFlags fl
 //     cbUnit->listBox()->sort();
 //#endif
        ui.cbUnit->setInsertPolicy(QComboBox::InsertAtBottom);
-       ui.cbUnit->addItem(RS_Units::unitToString(RS2::None), 0);
+       ui.cbUnit->addItem(Units::unitToString(RS2::None), 0);
 
        QString def_unit = "Millimeter";
 #ifdef QC_PREDEFINED_UNIT
@@ -154,10 +154,10 @@ void DlgOptionsGeneral::setRestartNeeded()
 
 void DlgOptionsGeneral::ok()
 {
-       //RS_SYSTEM->loadTranslation(cbLanguage->currentText());
+       //SYSTEM->loadTranslation(cbLanguage->currentText());
        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.setValue("ShowCrosshairs", ui.cbShowCrosshairs->isChecked());
        settings.setValue("ScaleGrid", ui.cbScaleGrid->isChecked());
        settings.setValue("MinGridSpacing", ui.cbMinGridSpacing->currentText());
@@ -179,7 +179,7 @@ void DlgOptionsGeneral::ok()
        settings.endGroup();
 
        settings.beginGroup("Defaults");
-       settings.setValue("Unit", RS_Units::unitToString(RS_Units::stringToUnit(ui.cbUnit->currentText()), false/*untr.*/));
+       settings.setValue("Unit", Units::unitToString(Units::stringToUnit(ui.cbUnit->currentText()), false/*untr.*/));
        settings.endGroup();
 
        if (restartNeeded == true)