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

5 files changed, 24 insertions, 30 deletions

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;

diff --git a/plugins/HistoryPlusPlus/historypp.dproj b/plugins/HistoryPlusPlus/historypp.dproj
index c8dfab1438..88f6028e9f 100644
--- a/plugins/HistoryPlusPlus/historypp.dproj
+++ b/plugins/HistoryPlusPlus/historypp.dproj
@@ -123,9 +123,9 @@
 			<DCC_DcuOutput>..\..\bin10\Debug\Obj\hpp\</DCC_DcuOutput>

 		</PropertyGroup>

 		<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">

-			<Debugger_CWD>W:\miranda-ng\bin12\Debug64</Debugger_CWD>

+			<Debugger_CWD>D:\Myranda\bin12\Debug64</Debugger_CWD>

 			<DCC_DebugDCUs>true</DCC_DebugDCUs>

-			<Debugger_HostApplication>W:\miranda-ng\bin12\Debug64\Miranda64.exe</Debugger_HostApplication>

+			<Debugger_HostApplication>D:\Myranda\bin12\Debug64\Miranda64.exe</Debugger_HostApplication>

 			<BRCC_OutputDir>..\..\bin10\temp\res\</BRCC_OutputDir>

 			<DCC_ExeOutput>..\..\bin12\Debug64\Plugins\</DCC_ExeOutput>

 			<DCC_BplOutput>..\..\bin12\Debug64\Plugins\</DCC_BplOutput>

@@ -133,12 +133,6 @@
 			<DCC_DcpOutput>..\..\bin12\Debug64\Obj\hpp\</DCC_DcpOutput>

 		</PropertyGroup>

 		<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">

-			<DCC_BplOutput>..\..\bin12\Debug\Plugins\</DCC_BplOutput>

-			<DCC_ExeOutput>..\..\bin12\Debug\Plugins\</DCC_ExeOutput>

-			<DCC_DcpOutput>..\..\bin12\Debug\Obj\hpp\</DCC_DcpOutput>

-			<DCC_DcuOutput>..\..\bin12\Debug\Obj\hpp\</DCC_DcuOutput>

-			<Debugger_CWD>W:\miranda-ng\bin12\Debug</Debugger_CWD>

-			<Debugger_HostApplication>W:\miranda-ng\bin12\Debug\Miranda32.exe</Debugger_HostApplication>

 			<DCC_DebugDCUs>true</DCC_DebugDCUs>

 		</PropertyGroup>

 		<ItemGroup>

diff --git a/plugins/HistoryPlusPlus/hpp_events.pas b/plugins/HistoryPlusPlus/hpp_events.pas
index b301c2f0a7..848008a37e 100644
--- a/plugins/HistoryPlusPlus/hpp_events.pas
+++ b/plugins/HistoryPlusPlus/hpp_events.pas
@@ -382,7 +382,7 @@ begin
   end;

 end;

 

-function TextHasUrls(var Text: WideString): Boolean;

+function TextHasUrls(var Text: String): Boolean;

 var

   i,len,lenW: Integer;

   pText,pPos: PChar;

diff --git a/plugins/HistoryPlusPlus/hpp_externalgrid.pas b/plugins/HistoryPlusPlus/hpp_externalgrid.pas
index 7167245f05..2bf5dd6c8c 100644
--- a/plugins/HistoryPlusPlus/hpp_externalgrid.pas
+++ b/plugins/HistoryPlusPlus/hpp_externalgrid.pas
@@ -107,8 +107,8 @@ type
     function IsFileEvent(Index: Integer): Boolean;

   protected

     procedure GridItemData(Sender: TObject; Index: Integer; var Item: THistoryItem);

-    procedure GridTranslateTime(Sender: TObject; Time: DWord; var Text: WideString);

-    procedure GridNameData(Sender: TObject; Index: Integer; var Name: WideString);

+    procedure GridTranslateTime(Sender: TObject; Time: DWord; var Text: String);

+    procedure GridNameData(Sender: TObject; Index: Integer; var Name: String);

     procedure GridProcessRichText(Sender: TObject; Handle: THandle; Item: Integer);

     procedure GridUrlClick(Sender: TObject; Item: Integer; URLText: String; Button: TMouseButton);

     procedure GridBookmarkClick(Sender: TObject; Item: Integer);

@@ -547,12 +547,12 @@ begin
   end;

 end;

 

-procedure TExternalGrid.GridTranslateTime(Sender: TObject; Time: DWord; var Text: WideString);

+procedure TExternalGrid.GridTranslateTime(Sender: TObject; Time: DWord; var Text: String);

 begin

-  Text := WideString(TimestampToString(Time));

+  Text := TimestampToString(Time);

 end;

 

-procedure TExternalGrid.GridNameData(Sender: TObject; Index: Integer; var Name: WideString);

+procedure TExternalGrid.GridNameData(Sender: TObject; Index: Integer; var Name: String);

 begin

   if Name = '' then

   begin

diff --git a/plugins/HistoryPlusPlus/hpp_global.pas b/plugins/HistoryPlusPlus/hpp_global.pas
index f21092d9ed..d0b04669c6 100644
--- a/plugins/HistoryPlusPlus/hpp_global.pas
+++ b/plugins/HistoryPlusPlus/hpp_global.pas
@@ -81,7 +81,7 @@ type
     Height: Integer;

     Module: AnsiString;

     Proto: AnsiString;

-    Text: WideString;

+    Text: String;

     CodePage: Cardinal;

     RTLMode: TRTLMode;

     HasHeader: Boolean;    // header for sessions