From 2cfab10cb1f9f6f6e44d438576db61d56f5aac99 Mon Sep 17 00:00:00 2001
From: nickysn <nickysn@gmail.com>
Date: Wed, 10 Feb 2021 14:05:40 +0000
Subject: [PATCH] + use Sw_String in unit histlist/uhistlist to reduce the
 number of ifdefs

git-svn-id: branches/unicodekvm@48603 -
---
 packages/fv/src/histlist.inc | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/packages/fv/src/histlist.inc b/packages/fv/src/histlist.inc
index fb86253832..d9d439e939 100644
--- a/packages/fv/src/histlist.inc
+++ b/packages/fv/src/histlist.inc
@@ -121,11 +121,7 @@ FUNCTION HistoryCount (Id: Byte): Word;
 Returns the Index'th string in the history list with ID number Id.
 30Sep99 LdB
 ---------------------------------------------------------------------}
-{$ifdef FV_UNICODE}
-FUNCTION HistoryStr (Id: Byte; Index: Sw_Integer): UnicodeString;
-{$else FV_UNICODE}
-FUNCTION HistoryStr (Id: Byte; Index: Sw_Integer): String;
-{$endif FV_UNICODE}
+FUNCTION HistoryStr (Id: Byte; Index: Sw_Integer): Sw_String;
 
 {-ClearHistory-------------------------------------------------------
 Removes all strings from all history lists.
@@ -137,11 +133,7 @@ PROCEDURE ClearHistory;
 Adds the string Str to the history list indicated by Id.
 30Sep99 LdB
 ---------------------------------------------------------------------}
-{$ifdef FV_UNICODE}
-PROCEDURE HistoryAdd (Id: Byte; Const Str: UnicodeString);
-{$else FV_UNICODE}
-PROCEDURE HistoryAdd (Id: Byte; Const Str: String);
-{$endif FV_UNICODE}
+PROCEDURE HistoryAdd (Id: Byte; Const Str: Sw_String);
 
 function HistoryRemove(Id: Byte; Index: Sw_Integer): boolean;
 
@@ -479,11 +471,7 @@ END;
 {---------------------------------------------------------------------------}
 {  HistoryStr -> Platforms DOS/DPMI/WIN/NT/OS2 - Updated 30Sep99 LdB        }
 {---------------------------------------------------------------------------}
-{$ifdef FV_UNICODE}
-FUNCTION HistoryStr(Id: Byte; Index: Sw_Integer): UnicodeString;
-{$else FV_UNICODE}
-FUNCTION HistoryStr(Id: Byte; Index: Sw_Integer): String;
-{$endif FV_UNICODE}
+FUNCTION HistoryStr(Id: Byte; Index: Sw_Integer): Sw_String;
 VAR I: Sw_Integer;
 {$ifdef FV_UNICODE}
     TmpP: Pointer;
@@ -521,11 +509,7 @@ END;
 {---------------------------------------------------------------------------}
 {  HistoryAdd -> Platforms DOS/DPMI/WIN/NT/OS2 - Updated 30Sep99 LdB        }
 {---------------------------------------------------------------------------}
-{$ifdef FV_UNICODE}
-PROCEDURE HistoryAdd (Id: Byte; Const Str: UnicodeString);
-{$else FV_UNICODE}
-PROCEDURE HistoryAdd (Id: Byte; Const Str: String);
-{$endif FV_UNICODE}
+PROCEDURE HistoryAdd (Id: Byte; Const Str: Sw_String);
 {$ifdef FV_UNICODE}
 VAR StrU8: UTF8String; TmpP: PByte; TmpLen: SizeUInt;
 {$endif FV_UNICODE}