Changeset 140 for trunk/NewView/HelpFile.pas

Timestamp:

Apr 30, 2007, 9:01:02 PM (18 years ago)

Author:

RBRi

Message:

more refactoring

File:

• trunk/NewView/HelpFile.pas (modified) (7 diffs)

trunk/NewView/HelpFile.pas

@@ -157 +157 @@
   BseErr,
   StringUtilsUnit,
+  CharUtilsUnit,
   DebugUnit,
-  ACLStringUtility,
   ACLFileIOUtility,
   ACLLanguageUnit;
@@ -964 +964 @@
   i: longint;
   pFontSpec: pTHelpFontSpec;
+  tmpSubstitutionItems : TStringList;
+  tmpCounter : integer;
+  tmpDimensionParts : TStringList;
 begin
   ParseFontTable; // (re)load table from raw data
 
-  while Substitutions <> '' do
-  begin
-    Item := ExtractNextValue( Substitutions, ';' );
+  tmpSubstitutionItems := TStringList.Create;
+  StrExtractStrings(tmpSubstitutionItems, Substitutions, [';'], #0);
+
+  for tmpCounter := 0 to tmpSubstitutionItems.Count - 1 do
+  begin
+    Item := tmpSubstitutionItems[tmpCounter];
     try
       if Item <> '' then
@@ -975 +981 @@
         // Look for space in xxxx WxH
 
-        SpacePos := FindCharFromEnd( Item, ' ' );
+        SpacePos := LastPosOfChar(' ', Item);
         if SpacePos > 0 then
         begin
@@ -981 +987 @@
           FontName := StrLeft( Item, SpacePos - 1 );
           Delete( Item, 1, SpacePos );
+
           // width and height after, with an X between
-          W := StrToInt( ExtractNextValue( Item, 'x' ) );
-          H := StrToInt( Item );
+          tmpDimensionParts := TStringList.Create;
+          StrExtractStrings(tmpDimensionParts, Item, ['x'], #0);
+          W := StrToInt(tmpDimensionParts[0]);
+          H := StrToInt(tmpDimensionParts[1]);
+          tmpDimensionParts.Destroy;
           if ( W > 0 ) and ( H > 0 ) then
           begin
@@ -990 +1000 @@
             begin
               pFontSpec := _FontTable[ i ];
-              if StrNPas( pFontSpec ^. FaceName,
-                          sizeof( pFontSpec ^. FaceName ) ) = FontName then
+              if StrPasWithLength( pFontSpec^.FaceName, sizeof( pFontSpec^.FaceName ) ) = FontName then
               begin
                 // same face name...
@@ -1007 +1016 @@
     end;
   end;
+
+  tmpSubstitutionItems.Destroy;
 end;
 
@@ -1026 +1037 @@
   Result := '';
 
-  if    StringsSame( Ext, '.inf' )
-     or StringsSame( Ext, '.hlp' ) then
+  if    StrEqualIgnoringCase( Ext, '.inf' )
+     or StrEqualIgnoringCase( Ext, '.hlp' ) then
   begin
     szName := Filename;