Changeset 42 for trunk/Common/UHtmlClasses.pas

Timestamp:

Nov 21, 2010, 8:49:46 AM (14 years ago)

Author:

george

Message:

• Upraveno: Zbylé výskyty TStringListEx nahrazeny TListString a TDictionaryStringString.

File:

• trunk/Common/UHtmlClasses.pas (modified) (7 diffs)

trunk/Common/UHtmlClasses.pas

@@ -6 +6 @@
 
 uses
-  UXmlClasses, Classes, SysUtils, UStringListEx, SpecializedObjectList;
+  UXmlClasses, Classes, SysUtils, SpecializedList, SpecializedObjectList;
 
 type
@@ -257 +257 @@
         with TXmlTag(SubElements[SubElements.Add(TXmlTag.Create)]) do begin
           Name := 'meta';
-          Attributes.AddNameValue('http-equiv', 'Content-Language');
-          Attributes.AddNameValue('content', ContentLanguage);
+          Attributes.Add('http-equiv', 'Content-Language');
+          Attributes.Add('content', ContentLanguage);
         end;
         with TXmlTag(SubElements[SubElements.Add(TXmlTag.Create)]) do begin
           Name := 'meta';
-          Attributes.AddNameValue('http-equiv', 'Content-Type');
-          Attributes.AddNameValue('content', 'text/html; charset=' + ContentEncoding);
+          Attributes.Add('http-equiv', 'Content-Type');
+          Attributes.Add('content', 'text/html; charset=' + ContentEncoding);
         end;
         for I := 0 to Styles.Count - 1 do
         with TXmlTag(SubElements[SubElements.Add(TXmlTag.Create)]) do begin
           Name := 'link';
-          Attributes.AddNameValue('rel', 'stylesheet');
-          Attributes.AddNameValue('href', Styles[I]);
-          Attributes.AddNameValue('type', 'text/css');
-          Attributes.AddNameValue('media', 'all');
+          Attributes.Add('rel', 'stylesheet');
+          Attributes.Add('href', Styles[I]);
+          Attributes.Add('type', 'text/css');
+          Attributes.Add('media', 'all');
         end;
         for I := 0 to Scripts.Count - 1 do
@@ -277 +277 @@
           Name := 'script';
           ShringEmpty := False;
-          Attributes.AddNameValue('type', 'text/javascript');
-          Attributes.AddNameValue('src', Scripts[I]);
+          Attributes.Add('type', 'text/javascript');
+          Attributes.Add('src', Scripts[I]);
         end;
       end;
@@ -381 +381 @@
 procedure TIpAddress.SetAsString(const Value: string);
 var
-  Parts: TStringListEx;
+  Parts: TListString;
 begin
   try
-    Parts := TStringListEx.Create;
-    Parts.Explode('.', Value);
+    Parts := TListString.Create;
+    Parts.Explode(Value, '.', StrToStr);
     try
 //    if Length(Parts) = 4 then begin
@@ -465 +465 @@
 procedure TDomainAddress.SetAsString(const Value: string);
 var
-  StrArray: TStringListEx;
+  StrArray: TListString;
   I: Integer;
 begin
   try
-    StrArray := TStringListEx.Create;
-    StrArray.Explode('.', Value);
+    StrArray := TListString.Create;
+    StrArray.Explode(Value, '.', StrToStr);
     SetLength(Levels, StrArray.Count);
     for I := 0 to StrArray.Count do
@@ -497 +497 @@
   with TXmlTag(Result) do begin
     Name := 'a';
-    Attributes.Add('href='+Target.AsString);
+    Attributes.Add('href', Target.AsString);
     if Assigned(Content) then SubElements.Add(Content.AsXmlElement);
   end;
@@ -564 +564 @@
   with TXmlTag(Result) do begin
     Name := 'img';
-    Attributes.AddNameValue('src', Source.AsString);
-    Attributes.AddNameValue('width', IntToStr(Size.Width));
-    Attributes.AddNameValue('height', IntToStr(Size.Height));
-    Attributes.AddNameValue('alt', AlternateText);
+    Attributes.Add('src', Source.AsString);
+    Attributes.Add('width', IntToStr(Size.Width));
+    Attributes.Add('height', IntToStr(Size.Height));
+    Attributes.Add('alt', AlternateText);
   end;
 end;