Changeset 395 for trunk/Components

Timestamp:

May 22, 2016, 12:17:37 PM (9 years ago)

Author:

RBRi

Message:

remove usage of ACLStringUtility

Location:

trunk/Components

Files:

• Outline2.PAS (modified) (3 diffs)
• RichTextLayoutUnit.pas (modified) (4 diffs)
• RichTextView.PAS (modified) (4 diffs)

trunk/Components/Outline2.PAS

@@ -4 +4 @@
 
 Uses
-  Classes, Forms, SysUtils, BseDos;
+  Classes,
+  Forms,
+  SysUtils,
+  BseDos;
 
 {
@@ -455 +458 @@
 uses
   Messages,
-  ACLStringUtility,
-  ControlScrolling;
+  ControlScrolling,
+  StringUtilsUnit;
 
 // ============================================================================
@@ -2214 +2217 @@
       exit;
 
-    if StrStarts( S, Node.Text ) then
+    if StrStartsWithIgnoringCase(Node.Text, S) then
     begin
       // found

trunk/Components/RichTextLayoutUnit.pas

@@ -145 +145 @@
 
 Uses
-  SysUtils, PMWin, BseDos, Dos, ClipBrd, Printers,
-  ACLUtility, ACLStringUtility, ACLString,
-  ControlScrolling;
+  SysUtils,
+  PMWin,
+  BseDos,
+  Dos,
+  ClipBrd,
+  Printers,
+  ACLUtility,
+  ACLString,
+  ControlScrolling,
+  CharUtilsUnit;
 
 Function TRichTextLayout.GetTextEnd: longint;
@@ -313 +320 @@
     inc( FHeight, CurrentLine.Height );
 
-    CurrentLine.Length := PCharDiff( EndPoint, CurrentLine.Text );
+    CurrentLine.Length := PCharPointerDiff( EndPoint, CurrentLine.Text );
 
     CurrentLine.Width := EndX;
@@ -771 +778 @@
         begin
           // found
-          Offset := PCharDiff( P, Line.Text );
+          Offset := PCharPointerDiff( P, Line.Text );
           Link := CurrentLink;
           exit;
@@ -1027 +1034 @@
 Function TRichTextLayout.GetCharIndex( P: PChar ): longint;
 begin
-  Result := PCharDiff( P, FText );
+  Result := PCharPointerDiff( P, FText );
 end;
 

trunk/Components/RichTextView.PAS

@@ -428 +428 @@
 
 Uses
-  SysUtils, PMWin, BseDos, Dos, ClipBrd, Printers,
-  ACLStringUtility, ACLString,
-  ControlScrolling, ControlsUtility,
-  RichTextDocumentUnit, RichTextDisplayUnit;
+  SysUtils,
+  PMWin,
+  BseDos,
+  Dos,
+  ClipBrd,
+  Printers,
+  ACLString,
+  ControlScrolling,
+  ControlsUtility,
+  RichTextDocumentUnit,
+  RichTextDisplayUnit,
+
+  CharUtilsUnit;
 
 Procedure TRichTextView.SetSelectionStart( SelectionStart: longint );
@@ -2050 +2059 @@
 //  SetCursorIndex( GetCharIndex( P ), PreserveSelection );
   Line := FLayout.FLines[ CursorRow ];
-  NewOffset := PCharDiff( P, Line.Text );
+  NewOffset := PCharPointerDiff( P, Line.Text );
   if NewOffset < Line.Length then
   begin
@@ -2090 +2099 @@
 //    exit;
   Line := FLayout.FLines[ CursorRow ];
-  NewOffset := PCharDiff( P, Line.Text );
+  NewOffset := PCharPointerDiff( P, Line.Text );
   if NewOffset >= 0 then
   begin
@@ -2255 +2264 @@
                                    255 );
 
-  Result := StrNPas( Buffer, Length );
+  Result := StrPasWithLength( Buffer, Length );
 end;