From b12e5d3ec309d625e39d9a14d80de4b670478cca Mon Sep 17 00:00:00 2001
From: yoffy <yoffy>
Date: Sat, 22 Nov 2003 12:17:50 +0000
Subject: [PATCH] =?utf8?q?=E3=83=BB=E3=83=87=E3=82=B3=E3=83=BC=E3=83=89?=
 =?utf8?q?=E3=81=AF=20URL=20=E3=83=87=E3=82=B3=E3=83=BC=E3=83=89=E3=81=AA?=
 =?utf8?q?=E3=81=AE=E3=81=AB=E3=80=81=E3=82=A8=E3=83=B3=E3=82=B3=E3=83=BC?=
 =?utf8?q?=E3=83=89=E3=81=8C=E9=96=93=E9=81=95=E3=81=A3=E3=81=A6=E3=81=84?=
 =?utf8?q?=E3=81=9F=E3=81=AE=E3=81=A7=20URL=20=E3=82=A8=E3=83=B3=E3=82=B3?=
 =?utf8?q?=E3=83=BC=E3=83=89=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
 =?utf8?q?=E4=BF=AE=E6=AD=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Favorite.pas   | 8 ++++----
 GikoXMLDoc.pas | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Favorite.pas b/Favorite.pas
index 413078e..2b4e015 100644
--- a/Favorite.pas
+++ b/Favorite.pas
@@ -352,21 +352,21 @@ begin
 	for i := 0 to Node.Count - 1 do begin
 		if TObject(Node.Item[i].Data) is TFavoriteFolder then begin
     	if Node.Item[ i ].Expanded then
-				s := Format('<folder title="%s" expanded="true">', [HtmlEncode(Node.Item[i].Text)])
+				s := Format('<folder title="%s" expanded="true">', [HttpEncode(Node.Item[i].Text)])
       else
-				s := Format('<folder title="%s" expanded="false">', [HtmlEncode(Node.Item[i].Text)]);
+				s := Format('<folder title="%s" expanded="false">', [HttpEncode(Node.Item[i].Text)]);
 			SaveList.Add(s);
 			AddSaveString(Node.Item[i], SaveList);
 			SaveList.Add('</folder>');
 		end else if TObject(Node.Item[i].Data) is TFavoriteBoardItem then begin
 			FavBoard := TFavoriteBoardItem(Node.Item[i].Data);
 			s := Format('<favitem type="2ch" favtype="board" url="%s" title="%s"/>',
-									[HtmlEncode( FavBoard.Item.URL ), HtmlEncode(FavBoard.Title)]);
+									[HttpEncode( FavBoard.Item.URL ), HttpEncode(FavBoard.Title)]);
 			SaveList.Add(s);
 		end else if TObject(Node.Item[i].Data) is TFavoriteThreadItem then begin
 			FavThread := TFavoriteThreadItem(Node.Item[i].Data);
 			s := Format('<favitem type="2ch" favtype="thread" url="%s" title="%s"/>',
-									[HtmlEncode( FavThread.Item.URL ), HtmlEncode(FavThread.Title)]);
+									[HttpEncode( FavThread.Item.URL ), HttpEncode(FavThread.Title)]);
 			SaveList.Add(s);
 		end;
 	end;
diff --git a/GikoXMLDoc.pas b/GikoXMLDoc.pas
index ae3e00e..99cba6c 100644
--- a/GikoXMLDoc.pas
+++ b/GikoXMLDoc.pas
@@ -394,7 +394,7 @@ begin
 						f.Seek( last, soFromBeginning );
 						f.ReadBuffer( PChar( attributeValue )^, tagLen );
 
-						node.AddAttribute( attributeName, HtmlDecode( attributeValue ) );
+						node.AddAttribute( attributeName, HttpDecode( attributeValue ) );
 
 						// ’l‚ð“ǂݏI‚í‚Á‚½‚̂ŏI—¹
 						f.Seek( f.Position + 1, soFromBeginning ); // '"' ”ò‚΂µ
@@ -402,7 +402,7 @@ begin
 					end else if ch in kXMLWhite then
 					begin
 						// ‹KŠiŠO‚¾‚¯‚Ç‚Ë
-						node.AddAttribute( attributeName, HtmlDecode( attributeValue ) );
+						node.AddAttribute( attributeName, HttpDecode( attributeValue ) );
 
 						goto NextNode;
 					end else begin
-- 
2.11.0