Changeset 252 for trunk/NewView

Timestamp:

Sep 21, 2007, 5:57:18 PM (18 years ago)

Author:

RBRi

Message:

fix for #33
fix usage of StrStartsWithIgnoringCase

Location:

trunk/NewView

Files:

• HelpFile.pas (modified) (3 diffs)
• HelpTopic.pas (modified) (1 diff)
• MainForm.pas (modified) (3 diffs)
• SearchUnit.pas (modified) (1 diff)

trunk/NewView/HelpFile.pas

@@ -669 +669 @@
 var
   i: longint;
+  tmpIndex: String;
 begin
   result := nil;
@@ -674 +675 @@
   for i := 0 to _Index.Count - 1 do
   begin
-    if StrStartsWithIgnoringCase( SearchText, _Index.ValuePtrs[ i ] ^ ) then
+    tmpIndex := _Index.ValuePtrs[i]^;
+    if StrStartsWithIgnoringCase(tmpIndex, SearchText) then
     begin
       // found
@@ -718 +720 @@
       if tmpLevel = tmpTopic.ContentsLevel then
       begin
-        if StrStartsWithIgnoringCase( SearchText, tmpTopic.TitlePtr ^ ) then
+        if StrStartsWithIgnoringCase(tmpTopic.TitlePtr^, SearchText) then
         begin
           result := tmpTopic;

trunk/NewView/HelpTopic.pas

@@ -1052 +1052 @@
       ProgramFilename := ExtractFilename( ProgramPath );
 
-      if    StrStartsWithIgnoringCase(PRGM_EXPLORER, ProgramFilename ) // web explorer?
-         or StrStartsWithIgnoringCase(PRGM_NETSCAPE, ProgramFilename )
-         or StrStartsWithIgnoringCase(PRGM_MOZILLA, ProgramFilename )
-         or StrStartsWithIgnoringCase(PRGM_FIREFOX, ProgramFilename )
+      if    StrStartsWithIgnoringCase(ProgramFilename, PRGM_EXPLORER)
+         or StrStartsWithIgnoringCase(ProgramFilename, PRGM_NETSCAPE)
+         or StrStartsWithIgnoringCase(ProgramFilename, PRGM_MOZILLA)
+         or StrStartsWithIgnoringCase(ProgramFilename, PRGM_FIREFOX)
          then
       begin

trunk/NewView/MainForm.pas

@@ -2384 +2384 @@
   Filename := THelpFile( CurrentOpenFiles[ 0 ] ).Filename;
   NamePart := ExtractFileName( Filename );
-  Result := StrStartsWithIgnoringCase('newview', NamePart);
+  Result := StrStartsWithIgnoringCase(NamePart, 'newview');
 end;
 
@@ -4487 +4487 @@
 End;
 
-Procedure TMainForm.IndexSearchEditOnScan (Sender: TObject;
-  Var KeyCode: TKeyCode);
+Procedure TMainForm.IndexSearchEditOnScan (Sender: TObject; Var KeyCode: TKeyCode);
 Begin
   case KeyCode of
@@ -4515 +4514 @@
 Procedure TMainForm.IndexSearchEditOnChange (Sender: TObject);
 var
-  MatchIndex: longint;
-  IndexINdex: longint;
-  SearchText: string;
+  tmpMatchIndex : longint;
+  tmpSearchText: string;
+  i : longint;
 Begin
   if InIndexSearch then
     exit;
 
-  MatchIndex:= -1;
-  SearchText:= trim( IndexSearchEdit.Text );
-  for IndexIndex:= 0 to DisplayedIndex.Count - 1 do
-  begin
-    if StrStartsWithIgnoringCase( SearchText, DisplayedIndex[ IndexIndex ] ) then //IndexEntry ) then
+  tmpMatchIndex := -1;
+  tmpSearchText := trim(IndexSearchEdit.Text);
+
+  for i := 0 to DisplayedIndex.Count - 1 do
+  begin
+    if StrStartsWithIgnoringCase(DisplayedIndex[i], tmpSearchText) then
     begin
-      MatchIndex:= IndexIndex;
+      tmpMatchIndex := i;
       break;
     end;
   end;
 
-  if MatchIndex = -1 then
+  if tmpMatchIndex = -1 then
     exit;
 
   InIndexSearch:= true;
 
-  if IndexListBox.ItemIndex <> MatchIndex then
-    IndexListBox.ItemIndex:= MatchIndex;
+  if IndexListBox.ItemIndex <> tmpMatchIndex then
+    IndexListBox.ItemIndex:= tmpMatchIndex;
 
   InIndexSearch:= false;

trunk/NewView/SearchUnit.pas

@@ -168 +168 @@
   begin
     DictWord := HelpFile.DictionaryWords[ DictIndex ];
-    if StrStartsWithIgnoringCase( SearchWord, DictWord ) then
+    if StrStartsWithIgnoringCase(DictWord, SearchWord) then
       Results[ DictIndex ] := MatchedWordRelevance( SearchWord, DictWord );
   end;