From 4441cebd24986683d7997edb3a9a65021fcf6428 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 24 Aug 2016 14:44:40 +0000
Subject: hmm... this shall be System.String, otherwise it dies

git-svn-id: http://svn.miranda-ng.org/main/trunk@17205 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/HistoryPlusPlus/HistoryGrid.pas | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'plugins/HistoryPlusPlus/HistoryGrid.pas')

diff --git a/plugins/HistoryPlusPlus/HistoryGrid.pas b/plugins/HistoryPlusPlus/HistoryGrid.pas
index 0ccc1b4502..6954426099 100644
--- a/plugins/HistoryPlusPlus/HistoryGrid.pas
+++ b/plugins/HistoryPlusPlus/HistoryGrid.pas
@@ -123,11 +123,11 @@ type
   TOnSelect = procedure(Sender: TObject; Item, OldItem: Integer) of object;
   TOnBookmarkClick = procedure(Sender: TObject; Item: Integer) of object;
   TGetItemData = procedure(Sender: TObject; Index: Integer; var Item: THistoryItem) of object;
-  TGetNameData = procedure(Sender: TObject; Index: Integer; var Name: WideString) of object;
+  TGetNameData = procedure(Sender: TObject; Index: Integer; var Name: String) of object;
   TGetXMLData = procedure(Sender: TObject; Index: Integer; var Item: TXMLItem) of object;
   TGetMCData = procedure(Sender: TObject; Index: Integer; var Item: TMCItem; Stage: TSaveStage) of object;
   TOnPopup = TNotifyEvent;
-  TOnTranslateTime = procedure(Sender: TObject; Time: DWord; var Text: WideString) of object;
+  TOnTranslateTime = procedure(Sender: TObject; Time: DWord; var Text: String) of object;
   TOnProgress = procedure(Sender: TObject; Position, Max: Integer) of object;
   TOnSearchFinished = procedure(Sender: TObject; Text: String; Found: Boolean) of object;
   TOnSearched = TOnSearchFinished;
@@ -546,12 +546,12 @@ type
     procedure MakeSelected(Value: Integer);
     function GetSelCount: Integer;
     procedure SetFilter(const Value: TMessageTypes);
-    function GetTime(Time: DWord): WideString;
+    function GetTime(Time: DWord): String;
     function GetItems(Index: Integer): THistoryItem;
     function IsMatched(Index: Integer): Boolean;
     function IsUnknown(Index: Integer): Boolean;
     procedure WriteString(fs: TFileStream; Text: AnsiString);
-    procedure WriteWideString(fs: TFileStream; Text: WideString);
+    procedure WriteWideString(fs: TFileStream; Text: String);
     procedure CheckBusy;
     function GetSelItems(Index: Integer): Integer;
     procedure SetSelItems(Index: Integer; Item: Integer);
@@ -666,7 +666,7 @@ type
     property Items[Index: Integer]: THistoryItem read GetItems;
     property Bookmarked[Index: Integer]: Boolean read GetBookmarked write SetBookmarked;
     property SelectedItems[Index: Integer]: Integer read GetSelItems write SetSelItems;
-    function Search(Text: WideString; CaseSensitive: Boolean; FromStart: Boolean = False;
+    function Search(Text: String; CaseSensitive: Boolean; FromStart: Boolean = False;
       SearchAll: Boolean = False; FromNext: Boolean = False; Down: Boolean = True): Integer;
     function SearchItem(ItemID: Integer): Integer;
     procedure AddItem;
@@ -1641,7 +1641,7 @@ end;
 
 procedure THistoryGrid.PaintItem(Index: Integer; ItemRect: TRect);
 var
-  TimeStamp, HeaderName: WideString;
+  TimeStamp, HeaderName: String;
   OrgRect, ItemClipRect: TRect;
   TopIconOffset, IconOffset, TimeOffset: Integer;
   // icon: TIcon;
@@ -3158,7 +3158,7 @@ begin
   EndUpdate;
 end;
 
-function THistoryGrid.GetTime(Time: DWord): WideString;
+function THistoryGrid.GetTime(Time: DWord): String;
 begin
   if Assigned(FTranslateTime) then
     OnTranslateTime(Self, Time, Result)
@@ -3410,7 +3410,7 @@ var
   tok: TWideStrArray;
   toksp: TIntArray;
   subst: String;
-  from_nick, to_nick, nick: WideString;
+  from_nick, to_nick, nick: String;
   dt: TDateTime;
   Mes, selmes: String;
 begin
@@ -4329,7 +4329,7 @@ begin
   end;
 end;
 
-function THistoryGrid.Search(Text: WideString; CaseSensitive: Boolean;
+function THistoryGrid.Search(Text: String; CaseSensitive: Boolean;
   FromStart: Boolean = False; SearchAll: Boolean = False; FromNext: Boolean = False;
   Down: Boolean = True): Integer;
 var
@@ -4393,7 +4393,7 @@ begin
       else
       begin
         // need to strip bbcodes
-        if Pos(Text, WideUpperCase(FItems[Item].Text)) <> 0 then
+        if Pos(Text, string(WideUpperCase(FItems[Item].Text))) <> 0 then
         begin
           Result := Item;
           break;
@@ -4918,7 +4918,7 @@ procedure THistoryGrid.SaveItem(Stream: TFileStream; Item: Integer; SaveFormat:
   procedure SaveHTML;
   var
     mes_id, type_id: AnsiString;
-    nick, Mes, Time: WideString;
+    nick, Mes, Time: String;
     txt: AnsiString;
     FullHeader: Boolean;
   begin
@@ -4999,7 +4999,7 @@ procedure THistoryGrid.SaveItem(Stream: TFileStream; Item: Integer; SaveFormat:
 
   procedure SaveUnicode;
   var
-    nick, Mes, Time: WideString;
+    nick, Mes, Time: String;
     FullHeader: Boolean;
   begin
     FullHeader := not(FGroupLinked and FItems[Item].LinkedToPrev);
@@ -5029,7 +5029,7 @@ procedure THistoryGrid.SaveItem(Stream: TFileStream; Item: Integer; SaveFormat:
   procedure SaveText;
   var
     Time: AnsiString;
-    nick, Mes: WideString;
+    nick, Mes: String;
     FullHeader: Boolean;
   begin
     FullHeader := not(FGroupLinked and FItems[Item].LinkedToPrev);
@@ -5059,7 +5059,7 @@ procedure THistoryGrid.SaveItem(Stream: TFileStream; Item: Integer; SaveFormat:
   procedure SaveRTF;
   var
     RTFStream: AnsiString;
-    Text: WideString;
+    Text: String;
     FullHeader: Boolean;
   begin
     FullHeader := not(FGroupLinked and FItems[Item].LinkedToPrev);
@@ -5115,7 +5115,7 @@ begin
   fs.Write(Text[1], Length(Text));
 end;
 
-procedure THistoryGrid.WriteWideString(fs: TFileStream; Text: WideString);
+procedure THistoryGrid.WriteWideString(fs: TFileStream; Text: String);
 begin
   fs.Write(Text[1], Length(Text) * SizeOf(Char));
 end;
-- 
cgit v1.2.3