X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fdlgtext.cpp;h=5f72cbaa7abad8a56630f6737c8f38dea8fce7f3;hb=f62cebc26c7c3af447f0e4e4c43331f8589dce22;hp=c3299bc626849ae9025de2213f2fdd7ec6333a38;hpb=16ce54abf01ca3032e42a5bb11a4afcf9014dcca;p=architektonas

diff --git a/src/forms/dlgtext.cpp b/src/forms/dlgtext.cpp
index c3299bc..5f72cba 100644
--- a/src/forms/dlgtext.cpp
+++ b/src/forms/dlgtext.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 "dlgtext.h"
 
-#include "rs_filterdxf.h"
-#include "rs_font.h"
-#include "rs_system.h"
-#include "rs_text.h"
+#include "filterdxf.h"
+#include "font.h"
+#include "system.h"
+#include "text.h"
 #include "settings.h"
 
 DlgText::DlgText(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
@@ -77,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;
@@ -97,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();
@@ -145,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");
@@ -184,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()));
 	}
 }