Removed unnecessary RS_ prefix from classes and whatnot.

[architektonas] / src / forms / dlgtext.cpp

diff --git a/src/forms/dlgtext.cpp b/src/forms/dlgtext.cpp
index 6b90d22397abbb2c44df60ddc990ac9266525fa8..5f72cbaa7abad8a56630f6737c8f38dea8fce7f3 100644 (file)
--- a/src/forms/dlgtext.cpp
+++ b/src/forms/dlgtext.cpp
@@ -79,7 +79,7 @@ void DlgText::updateUniCharComboBox(int)
 /**
  * Sets the text entity represented by this dialog.
  */
-void DlgText::setText(RS_Text & t, bool isNew)
+void DlgText::setText(Text & t, bool isNew)
 {
        text = &t;
        this->isNew = isNew;
@@ -99,9 +99,9 @@ void DlgText::setText(RS_Text & t, bool isNew)
        {
                settings.beginGroup("Draw");
                //default font depending on locale
-//             Q3CString iso = RS_System::localeToISO( QTextCodec::locale() );
-//             QString iso = RS_System::localeToISO(QTextCodec::locale());
-               QString iso = RS_System::localeToISO(QLocale::system().name());
+//             Q3CString iso = System::localeToISO( QTextCodec::locale() );
+//             QString iso = System::localeToISO(QTextCodec::locale());
+               QString iso = System::localeToISO(QLocale::system().name());
 
                if (iso == "ISO8859-1")
                        fon = settings.value("TextFont", "normallatin1").toString();
@@ -147,7 +147,7 @@ void DlgText::setText(RS_Text & t, bool isNew)
 
                str = text->getText();
                //QString shape = settings.value("/TextShape", "0");
-               angle = QString("%1").arg(RS_Math::rad2deg(text->getAngle()));
+               angle = QString("%1").arg(Math::rad2deg(text->getAngle()));
        }
 
        ui.cbDefault->setChecked(def == "1");
@@ -186,12 +186,12 @@ void DlgText::updateText()
        {
                text->setStyle(ui.cbFont->currentText());
                text->setHeight(ui.leHeight->text().toDouble());
-//             text->setText(RS_FilterDXF::toNativeString(ui.teText->text()));
-               text->setText(RS_FilterDXF::toNativeString(ui.teText->toPlainText()));
+//             text->setText(FilterDXF::toNativeString(ui.teText->text()));
+               text->setText(FilterDXF::toNativeString(ui.teText->toPlainText()));
                //text->setLetterSpacing(leLetterSpacing.toDouble());
                text->setLineSpacingFactor(ui.leLineSpacingFactor->text().toDouble());
                text->setAlignment(getAlignment());
-               text->setAngle(RS_Math::deg2rad(ui.leAngle->text().toDouble()));
+               text->setAngle(Math::deg2rad(ui.leAngle->text().toDouble()));
        }
 }