Browse Source

* Some fixes

Michaël Van Canneyt 2 years ago
parent
commit
adc1723f97

+ 2 - 2
packages/ncurses/src/ocrt.pp

@@ -2144,13 +2144,13 @@ End;
 
 { nEdit using currently active window }
 Function nEdit(x,y,att,z,CursPos:integer;
-               es:string;var ch : integer) : string;
+               es:shortstring;var ch : integer) : shortstring;
 Begin
    nEdit := nEdit(ActiveWn,x,y,att,z,CursPos,es,ch);
 End;
 
 Function nEdit(x,y,att,z,CursPos:integer;
-               es:string;var ch : AnsiChar) : string;
+               es:shortstring;var ch : AnsiChar) : shortstring;
 Var i : integer;
 Begin
    nEdit := nEdit(ActiveWn,x,y,att,z,CursPos,es,i);

+ 1 - 1
packages/ptc/src/c_api/capi_copy.inc

@@ -86,7 +86,7 @@ begin
   end;
 end;
 
-function ptc_copy_option(obj: TPTC_COPY; option: String): Boolean;
+function ptc_copy_option(obj: TPTC_COPY; option: AnsiString): Boolean;
 begin
   try
     TPTCCopy(obj).option(option);

+ 1 - 1
packages/ptc/src/core/basesurfaced.inc

@@ -67,7 +67,7 @@ type
                     AArea: IPTCArea);
     procedure Palette(APalette: IPTCPalette);
     procedure Clip(AArea: IPTCArea);
-    function Option(const AOption: String): Boolean;
+    function Option(const AOption: AnsiString): Boolean;
     function Clip: IPTCArea;
     function Palette: IPTCPalette;
     property Width: Integer read GetWidth;

+ 1 - 1
packages/ptc/src/core/copyd.inc

@@ -46,5 +46,5 @@ type
                    ASourceWidth, ASourceHeight, ASourcePitch: Integer;
                    ADestinationPixels: Pointer; ADestinationX, ADestinationY,
                    ADestinationWidth, ADestinationHeight, ADestinationPitch: Integer);
-    function Option(const AOption: String): Boolean;
+    function Option(const AOption: AnsiString): Boolean;
   end;

+ 1 - 1
packages/ptc/src/core/copyi.inc

@@ -103,7 +103,7 @@ begin
     raise TPTCError.Create('hermes conversion failure');
 end;
 
-function TPTCCopy.Option(const AOption: String): Boolean;
+function TPTCCopy.Option(const AOption: AnsiString): Boolean;
 begin
   if (AOption = 'attempt dithering') and ((FFlags and HERMES_CONVERT_DITHER) = 0) then
   begin

+ 1 - 1
packages/symbolic/src/symbolic.pas

@@ -87,7 +87,7 @@ TYPE
                          function CopyTree(p :pnode):pnode;
                          function NewFunc(fun:funcop;son:pnode):pnode; overload;
                          function NewFunc(fun:funcop;son,son2:pnode):pnode; overload;
-                         function NewVar(variable:shortShortString):pnode;
+                         function NewVar(variable:shortString):pnode;
                          procedure DisposeExpr(p:pnode);
                          end;
 

+ 2 - 2
packages/symbolic/src/teval.inc

@@ -23,7 +23,7 @@ procedure TEvaluator.WriteVliw(p:VLIWEvalWord); forward;
 
 Procedure TEvalInternalError(A,B:ArbInt);
 
-VAR S,S2 : ShortShortString;
+VAR S,S2 : ShortString;
 
 begin
  Str(ORD(A),S);
@@ -86,7 +86,7 @@ begin
  inherited Destroy;
 end;
 
-PROCEDURE   TEvaluator.SetConstant(Name:ShortShortString;Value:ArbFloat);
+PROCEDURE   TEvaluator.SetConstant(Name:ShortString;Value:ArbFloat);
 
 Var Ind,I    : Longint;
     TmpList  : TList;