From 5181c9e22516a1eac84c4b6bce326d35986ab7c6 Mon Sep 17 00:00:00 2001
From: Rodrigo Braz Monteiro <zeratul@cellosoft.com>
Date: Thu, 13 Apr 2006 06:24:36 +0000
Subject: [PATCH] Originally committed to SVN as r313.

---
 core/ass_style.cpp           | 36 ++++++++++++++++++------------------
 core/dialog_style_editor.cpp |  2 +-
 core/utils.cpp               |  2 +-
 core/utils.h                 |  2 +-
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/core/ass_style.cpp b/core/ass_style.cpp
index cac8672e4..3f091123e 100644
--- a/core/ass_style.cpp
+++ b/core/ass_style.cpp
@@ -420,25 +420,25 @@ void AssStyle::UpdateData() {
 	final += outline.GetASSFormatted(true,false,true) + _T(",");
 	final += shadow.GetASSFormatted(true,false,true) + _T(",");
 
-	final += IntToString(bold?-1:0) + _T(",");
-	final += IntToString(italic?-1:0) + _T(",");
-	final += IntToString(underline?-1:0) + _T(",");
-	final += IntToString(strikeout?-1:0) + _T(",");
+	final += IntegerToString(bold?-1:0) + _T(",");
+	final += IntegerToString(italic?-1:0) + _T(",");
+	final += IntegerToString(underline?-1:0) + _T(",");
+	final += IntegerToString(strikeout?-1:0) + _T(",");
 
 	final += FloatToString(scalex) + _T(",");
 	final += FloatToString(scaley) + _T(",");
 	final += FloatToString(spacing) + _T(",");
 
 	final += FloatToString(angle) + _T(",");
-	final += IntToString(borderstyle) + _T(",");
+	final += IntegerToString(borderstyle) + _T(",");
 	final += FloatToString(outline_w) + _T(",");
 	final += FloatToString(shadow_w) + _T(",");
 
-	final += IntToString(alignment) + _T(",");
-	final += IntToString(MarginL) + _T(",");
-	final += IntToString(MarginR) + _T(",");
-	final += IntToString(MarginV) + _T(",");
-	final += IntToString(encoding);
+	final += IntegerToString(alignment) + _T(",");
+	final += IntegerToString(MarginL) + _T(",");
+	final += IntegerToString(MarginR) + _T(",");
+	final += IntegerToString(MarginV) + _T(",");
+	final += IntegerToString(encoding);
 	SetEntryData(final);
 }
 
@@ -496,10 +496,10 @@ wxString AssStyle::GetSSAText() {
 	output += _T("0,");
 	output += shadow.GetSSAFormatted() + _T(",");
 
-	output += IntToString(bold?-1:0) + _T(",");
-	output += IntToString(italic?-1:0) + _T(",");
+	output += IntegerToString(bold?-1:0) + _T(",");
+	output += IntegerToString(italic?-1:0) + _T(",");
 
-	output += IntToString(borderstyle) + _T(",");
+	output += IntegerToString(borderstyle) + _T(",");
 	output += FloatToString(outline_w) + _T(",");
 	output += FloatToString(shadow_w) + _T(",");
 
@@ -515,13 +515,13 @@ wxString AssStyle::GetSSAText() {
 		case 8: align = 6; break;
 		case 9: align = 7; break;
 	}
-	output += IntToString(align) + _T(",");
+	output += IntegerToString(align) + _T(",");
 
-	output += IntToString(MarginL) + _T(",");
-	output += IntToString(MarginR) + _T(",");
-	output += IntToString(MarginV) + _T(",");
+	output += IntegerToString(MarginL) + _T(",");
+	output += IntegerToString(MarginR) + _T(",");
+	output += IntegerToString(MarginV) + _T(",");
 	output += _T("0,");
-	output += IntToString(encoding);
+	output += IntegerToString(encoding);
 
 	return output;
 }
diff --git a/core/dialog_style_editor.cpp b/core/dialog_style_editor.cpp
index d81260105..ed8506bf2 100644
--- a/core/dialog_style_editor.cpp
+++ b/core/dialog_style_editor.cpp
@@ -211,7 +211,7 @@ DialogStyleEditor::DialogStyleEditor (wxWindow *parent, AssStyle *_style, Subtit
 	ScaleXValue = FloatToString(style->scalex);
 	ScaleYValue = FloatToString(style->scaley);
 	AngleValue = FloatToString(style->angle);
-	EncodingValue = IntToString(style->encoding);
+	EncodingValue = IntegerToString(style->encoding);
 	SpacingValue = FloatToString(style->spacing);
 	ScaleX = new wxTextCtrl(this,-1,_T(""),wxDefaultPosition, wxSize(70,20),0,wxTextValidator(wxFILTER_NUMERIC,&ScaleXValue));
 	ScaleY = new wxTextCtrl(this,-1,_T(""),wxDefaultPosition, wxSize(70,20),0,wxTextValidator(wxFILTER_NUMERIC,&ScaleYValue));
diff --git a/core/utils.cpp b/core/utils.cpp
index 6bda5e6e0..1060ad336 100644
--- a/core/utils.cpp
+++ b/core/utils.cpp
@@ -141,6 +141,6 @@ wxString FloatToString(double value) {
 
 /////////////////
 // Int to string
-wxString IntToString(int value) {
+wxString IntegerToString(int value) {
 	return wxString::Format(_T("%i"),value);
 }
diff --git a/core/utils.h b/core/utils.h
index e0f2791f5..0adb62877 100644
--- a/core/utils.h
+++ b/core/utils.h
@@ -46,7 +46,7 @@ wxString MakeRelativePath(wxString path,wxString reference);
 wxString DecodeRelativePath(wxString path,wxString reference);
 wxString PrettyFloat(wxString src);
 wxString FloatToString(double value);
-wxString IntToString(int value);
+wxString IntegerToString(int value);
 
 
 //////////