X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fdlginitial.cpp;h=f25d33c234b4f5ec1be3239db903411ca2ec5119;hb=f62cebc26c7c3af447f0e4e4c43331f8589dce22;hp=3f0f19f4b6e0dc4c37bd4c94be3414e7ec87912b;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/forms/dlginitial.cpp b/src/forms/dlginitial.cpp
index 3f0f19f..f25d33c 100644
--- a/src/forms/dlginitial.cpp
+++ b/src/forms/dlginitial.cpp
@@ -16,7 +16,7 @@
 
 #include "dlginitial.h"
 
-#include "rs.h"
+#include "enums.h"
 #include "settings.h"
 #include "system.h"
 #include "units.h"
@@ -27,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);
@@ -40,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");
@@ -68,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");