UPD: Refactoring

components/doublecmd/dcstrutils.pas

@@ -187,9 +187,6 @@ function ExcludeBackPathDelimiter(const Path: String): String;
    @returns(Position of character in string)
 }
 function CharPos(C: Char; const S: string; StartPos: Integer = 1): Integer;
-
-
-
 {en
   Return position of any of tag-characters in string T in string S begun from start position
   @param(T set of characters)
@@ -200,14 +197,6 @@ function CharPos(C: Char; const S: string; StartPos: Integer = 1): Integer;
 
 }
 function TagPos(T: string; const S: string; StartPos: Integer;SearchBackward: boolean=False): Integer;
-
-
-{en
-
-}
-function scopy(IndexBegin,IndexEnd:integer;str:string):string;
-
-
 {en
    Split file name on name and extension
    @param(sFileName File name)
@@ -783,7 +772,6 @@ begin
     Result:= Path;
 end;
 
-
 procedure DivFileName(const sFileName:String; out n,e:String);
 var
   i:Integer;
@@ -886,68 +874,53 @@ function CharPos(C: Char; const S: string; StartPos: Integer = 1): Integer;
 var
  sNewStr : String;
 begin
-if StartPos <> 1 then
-  begin
-    sNewStr := Copy(S, StartPos, Length(S) - StartPos + 1);
-    Result := Pos(C, sNewStr);
-    if Result <> 0 then
-      Result := Result + StartPos - 1;
-  end
-else
-  Result := Pos(C, S);
+  if StartPos <> 1 then
+    begin
+      sNewStr := Copy(S, StartPos, Length(S) - StartPos + 1);
+      Result := Pos(C, sNewStr);
+      if Result <> 0 then
+        Result := Result + StartPos - 1;
+    end
+  else
+    Result := Pos(C, S);
 end;
 
-
-
 function TagPos(T: string; const S: string; StartPos: Integer;
   SearchBackward: boolean): Integer;
-// in future this function will moved to DCStrUtils
 var
-  i,cnt:integer;
-  ch:char;
+  ch: AnsiChar;
+  i, cnt: Integer;
 begin
-  Result:=0;
-  i:=StartPos;
-  if i=0 then i:=1;
+  Result:= 0;
+  i:= StartPos;
+  if i = 0 then i:= 1;
 
-  cnt:=UTF8Length(S);
+  cnt:= UTF8Length(S);
 
   if SearchBackward then
   begin
-     while (i>0)do
-     begin
-       ch:=S[UTF8CharToByteIndex(PChar(S), length(S), i)];
-       if Pos(ch,T)=0 then
-          dec(i)
-       else
-          break;
-     end;
+    while (i > 0) do
+    begin
+     ch:= S[UTF8CharToByteIndex(PAnsiChar(S), Length(S), i)];
+     if Pos(ch, T) = 0 then
+       Dec(i)
+     else
+       Break;
+    end;
   end
   else
-     while (i<=cnt)do
-     begin
-       ch:=S[UTF8CharToByteIndex(PChar(S), length(S), i)];
-       if Pos(ch,T)=0 then
-          inc(i)
-       else
-          break;
-     end;
-
-
-  Result:=i;
-end;
-
+    while (i <= cnt) do
+    begin
+      ch:= S[UTF8CharToByteIndex(PAnsiChar(S), Length(S), i)];
+      if Pos(ch, T) = 0 then
+        Inc(i)
+      else
+        Break;
+    end;
 
-function scopy(IndexBegin,IndexEnd:integer;str:string):string;
-begin
-    if (IndexBegin<=IndexEnd) then
-        Result:=copy(str,IndexBegin,(IndexEnd-IndexBegin+1))
-    else
-        Result:='';
+  Result:= i;
 end;
 
-
-
 function NumCountChars(const Char: char; const S: String): Integer;
 var
   I : Integer;

src/fileviews/ufileviewwithmainctrl.pas

@@ -205,18 +205,6 @@ type
     procedure cm_ContextMenu(const Params: array of string);
   end;
 
-
-// in future this function will moved to DCStrUtils
-{en
-   Return position of first founded tag in string begun from start position
-   @param(T String set of tags)
-   @param(S String)
-   @param(StartPos Start position)
-   @returns(Position of first founded tag in string)
-}
-function TagPos(T:string; const S: string; StartPos: Integer = 1; SearchBackward:boolean=False): Integer;
-
-
 implementation
 
 uses
@@ -224,7 +212,7 @@ uses
   Gtk2Proc,  // for ReleaseMouseCapture
   GTK2Globals,  // for DblClickTime
 {$ENDIF}
-  LCLIntf, LCLProc, LazUTF8, Forms, Dialogs, Buttons, DCOSUtils,
+  LCLIntf, LCLProc, LazUTF8, Forms, Dialogs, Buttons, DCOSUtils, DCStrUtils,
   fMain, uShowMsg, uLng, uFileProperty, uFileSource, uFileSourceOperationTypes,
   uGlobs, uInfoToolTip, uDisplayFile, uFileSystemFileSource, uFileSourceUtil,
   uArchiveFileSourceUtil, uFormCommands, uKeyboard, uFileSourceSetFilePropertyOperation;
@@ -1673,43 +1661,5 @@ begin
   UpdateInfoPanel; // Update status line only
 end;
 
-function TagPos(T: string; const S: string; StartPos: Integer;
-  SearchBackward: boolean): Integer;
-// in future this function will moved to DCStrUtils
-var
-  i,cnt:integer;
-  ch:char;
-begin
-  Result:=0;
-  i:=StartPos;
-  if i=0 then i:=1;
-
-  cnt:=UTF8Length(S);
-
-  if SearchBackward then
-  begin
-     while (i>0)do
-     begin
-       ch:=S[UTF8CharToByteIndex(PChar(S), length(S), i)];
-       if Pos(ch,T)=0 then
-          dec(i)
-       else
-          break;
-     end;
-  end
-  else
-     while (i<=cnt)do
-     begin
-       ch:=S[UTF8CharToByteIndex(PChar(S), length(S), i)];
-       if Pos(ch,T)=0 then
-          inc(i)
-       else
-          break;
-     end;
-
-
-  Result:=i;
-end;
-
 end.