Browse Source

AnsiString to String on gui-classic

PascalCoin 6 years ago
parent
commit
061fc88fd2

+ 1 - 1
src/gui-classic/UFRMAccountSelect.pas

@@ -158,7 +158,7 @@ procedure TSearchThread.BCExecute;
     account : TAccount;
     account : TAccount;
     isValid : Boolean;
     isValid : Boolean;
     validAccKey : Boolean;
     validAccKey : Boolean;
-    errors : AnsiString;
+    errors : String;
     i : Integer;
     i : Integer;
   begin
   begin
     SetLength(FAccounts,0);
     SetLength(FAccounts,0);

+ 26 - 26
src/gui-classic/UFRMOperation.pas

@@ -155,15 +155,15 @@ type
     Procedure UpdateWalletKeys;
     Procedure UpdateWalletKeys;
     { Private declarations }
     { Private declarations }
     Procedure UpdateAccountsInfo;
     Procedure UpdateAccountsInfo;
-    Function UpdateFee(var Fee : Int64; errors : AnsiString) : Boolean;
-    Function UpdateOperationOptions(var errors : AnsiString) : Boolean;
-    Function UpdatePayload(Const SenderAccount : TAccount; var errors : AnsiString) : Boolean;
-    Function UpdateOpTransaction(Const SenderAccount : TAccount; var DestAccount : TAccount; var amount : Int64; var errors : AnsiString) : Boolean;
-    Function UpdateOpChangeKey(Const TargetAccount : TAccount; var SignerAccount : TAccount; var NewPublicKey : TAccountKey; var errors : AnsiString) : Boolean;
-    Function UpdateOpListForSale(Const TargetAccount : TAccount; var SalePrice : Int64; var SellerAccount,SignerAccount : TAccount; var NewOwnerPublicKey : TAccountKey; var LockedUntilBlock : Cardinal; var errors : AnsiString) : Boolean;
-    Function UpdateOpDelist(Const TargetAccount : TAccount; var SignerAccount : TAccount; var errors : AnsiString) : Boolean;
-    Function UpdateOpBuyAccount(Const SenderAccount : TAccount; var AccountToBuy : TAccount; var amount : Int64; var NewPublicKey : TAccountKey; var errors : AnsiString) : Boolean;
-    Function UpdateOpChangeInfo(Const TargetAccount : TAccount; var SignerAccount : TAccount; var changeName : Boolean; var newName : TRawBytes; var changeType : Boolean; var newType : Word; var errors : AnsiString) : Boolean;
+    Function UpdateFee(var Fee : Int64; errors : String) : Boolean;
+    Function UpdateOperationOptions(var errors : String) : Boolean;
+    Function UpdatePayload(Const SenderAccount : TAccount; var errors : String) : Boolean;
+    Function UpdateOpTransaction(Const SenderAccount : TAccount; var DestAccount : TAccount; var amount : Int64; var errors : String) : Boolean;
+    Function UpdateOpChangeKey(Const TargetAccount : TAccount; var SignerAccount : TAccount; var NewPublicKey : TAccountKey; var errors : String) : Boolean;
+    Function UpdateOpListForSale(Const TargetAccount : TAccount; var SalePrice : Int64; var SellerAccount,SignerAccount : TAccount; var NewOwnerPublicKey : TAccountKey; var LockedUntilBlock : Cardinal; var errors : String) : Boolean;
+    Function UpdateOpDelist(Const TargetAccount : TAccount; var SignerAccount : TAccount; var errors : String) : Boolean;
+    Function UpdateOpBuyAccount(Const SenderAccount : TAccount; var AccountToBuy : TAccount; var amount : Int64; var NewPublicKey : TAccountKey; var errors : String) : Boolean;
+    Function UpdateOpChangeInfo(Const TargetAccount : TAccount; var SignerAccount : TAccount; var changeName : Boolean; var newName : TRawBytes; var changeType : Boolean; var newType : Word; var errors : String) : Boolean;
     procedure SetDefaultFee(const Value: Int64);
     procedure SetDefaultFee(const Value: Int64);
     Procedure OnSenderAccountsChanged(Sender : TObject);
     Procedure OnSenderAccountsChanged(Sender : TObject);
     procedure OnWalletKeysChanged(Sender : TObject);
     procedure OnWalletKeysChanged(Sender : TObject);
@@ -216,7 +216,7 @@ end;
 { TFRMOperation }
 { TFRMOperation }
 
 
 procedure TFRMOperation.actExecuteExecute(Sender: TObject);
 procedure TFRMOperation.actExecuteExecute(Sender: TObject);
-Var errors : AnsiString;
+Var errors : String;
   P : PAccount;
   P : PAccount;
   i,iAcc : Integer;
   i,iAcc : Integer;
   wk : TWalletKey;
   wk : TWalletKey;
@@ -440,7 +440,7 @@ end;
 
 
 procedure TFRMOperation.bbPasswordClick(Sender: TObject);
 procedure TFRMOperation.bbPasswordClick(Sender: TObject);
 Var s : String;
 Var s : String;
-  errors : AnsiString;
+  errors : String;
 begin
 begin
   if FWalletKeys.IsValidPassword then begin
   if FWalletKeys.IsValidPassword then begin
   end else begin
   end else begin
@@ -598,7 +598,7 @@ begin
 end;
 end;
 
 
 procedure TFRMOperation.ebNewPublicKeyExit(Sender: TObject);
 procedure TFRMOperation.ebNewPublicKeyExit(Sender: TObject);
-var errors : AnsiString;
+var errors : String;
 begin
 begin
   UpdateOperationOptions(errors);
   UpdateOperationOptions(errors);
 end;
 end;
@@ -645,7 +645,7 @@ begin
 end;
 end;
 
 
 procedure TFRMOperation.memoPayloadClick(Sender: TObject);
 procedure TFRMOperation.memoPayloadClick(Sender: TObject);
-Var errors : AnsiString;
+Var errors : String;
 begin
 begin
   if SenderAccounts.Count>0 then begin
   if SenderAccounts.Count>0 then begin
     UpdatePayload(TNode.Node.Bank.SafeBox.Account(SenderAccounts.Get(0)),errors);
     UpdatePayload(TNode.Node.Bank.SafeBox.Account(SenderAccounts.Get(0)),errors);
@@ -653,7 +653,7 @@ begin
 end;
 end;
 
 
 procedure TFRMOperation.OnSenderAccountsChanged(Sender: TObject);
 procedure TFRMOperation.OnSenderAccountsChanged(Sender: TObject);
-Var errors : AnsiString;
+Var errors : String;
 begin
 begin
   if SenderAccounts.Count>1 then begin
   if SenderAccounts.Count>1 then begin
     ebAmount.Text := 'ALL BALANCE';
     ebAmount.Text := 'ALL BALANCE';
@@ -683,7 +683,7 @@ begin
 end;
 end;
 
 
 procedure TFRMOperation.PageControlOpTypeChange(Sender: TObject);
 procedure TFRMOperation.PageControlOpTypeChange(Sender: TObject);
-var errors : AnsiString;
+var errors : String;
 begin
 begin
   UpdateOperationOptions(errors);
   UpdateOperationOptions(errors);
 end;
 end;
@@ -781,7 +781,7 @@ begin
   End;
   End;
 end;
 end;
 
 
-function TFRMOperation.UpdateFee(var Fee: Int64; errors: AnsiString): Boolean;
+function TFRMOperation.UpdateFee(var Fee: Int64; errors: String): Boolean;
 begin
 begin
   errors := '';
   errors := '';
   if trim(ebFee.Text)<>'' then begin
   if trim(ebFee.Text)<>'' then begin
@@ -794,12 +794,12 @@ begin
 end;
 end;
 
 
 procedure TFRMOperation.updateInfoClick(Sender: TObject);
 procedure TFRMOperation.updateInfoClick(Sender: TObject);
-Var errors : AnsiString;
+Var errors : String;
 begin
 begin
   UpdateOperationOptions(errors);
   UpdateOperationOptions(errors);
 end;
 end;
 
 
-function TFRMOperation.UpdateOpBuyAccount(const SenderAccount: TAccount; var AccountToBuy: TAccount; var amount: Int64; var NewPublicKey: TAccountKey; var errors: AnsiString): Boolean;
+function TFRMOperation.UpdateOpBuyAccount(const SenderAccount: TAccount; var AccountToBuy: TAccount; var amount: Int64; var NewPublicKey: TAccountKey; var errors: String): Boolean;
 var c : Cardinal;
 var c : Cardinal;
   i : Integer;
   i : Integer;
 begin
 begin
@@ -854,7 +854,7 @@ begin
 end;
 end;
 
 
 function TFRMOperation.UpdateOpChangeInfo(const TargetAccount: TAccount; var SignerAccount : TAccount;
 function TFRMOperation.UpdateOpChangeInfo(const TargetAccount: TAccount; var SignerAccount : TAccount;
-   var changeName : Boolean; var newName: TRawBytes; var changeType : Boolean; var newType: Word; var errors: AnsiString): Boolean;
+   var changeName : Boolean; var newName: TRawBytes; var changeType : Boolean; var newType: Word; var errors: String): Boolean;
 var auxC : Cardinal;
 var auxC : Cardinal;
   i : Integer;
   i : Integer;
   errCode : Integer;
   errCode : Integer;
@@ -937,7 +937,7 @@ begin
   end;
   end;
 end;
 end;
 
 
-function TFRMOperation.UpdateOpChangeKey(Const TargetAccount : TAccount; var SignerAccount : TAccount; var NewPublicKey: TAccountKey; var errors: AnsiString): Boolean;
+function TFRMOperation.UpdateOpChangeKey(Const TargetAccount : TAccount; var SignerAccount : TAccount; var NewPublicKey: TAccountKey; var errors: String): Boolean;
 var i : Integer;
 var i : Integer;
   auxC : Cardinal;
   auxC : Cardinal;
 begin
 begin
@@ -1001,7 +1001,7 @@ begin
   end;
   end;
 end;
 end;
 
 
-function TFRMOperation.UpdateOpDelist(const TargetAccount : TAccount; var SignerAccount : TAccount; var errors: AnsiString): Boolean;
+function TFRMOperation.UpdateOpDelist(const TargetAccount : TAccount; var SignerAccount : TAccount; var errors: String): Boolean;
 Var auxC : Cardinal;
 Var auxC : Cardinal;
 begin
 begin
   lblDelistErrors.Caption := '';
   lblDelistErrors.Caption := '';
@@ -1051,11 +1051,11 @@ begin
   end;
   end;
 end;
 end;
 
 
-function TFRMOperation.UpdateOperationOptions(var errors : AnsiString) : Boolean;
+function TFRMOperation.UpdateOperationOptions(var errors : String) : Boolean;
 Var
 Var
   iWallet,iAcc : Integer;
   iWallet,iAcc : Integer;
   wk : TWalletKey;
   wk : TWalletKey;
-  e : AnsiString;
+  e : String;
   sender_account,dest_account,seller_account, account_to_buy, signer_account : TAccount;
   sender_account,dest_account,seller_account, account_to_buy, signer_account : TAccount;
   publicKey : TAccountKey;
   publicKey : TAccountKey;
   salePrice, amount : Int64;
   salePrice, amount : Int64;
@@ -1163,7 +1163,7 @@ end;
 function TFRMOperation.UpdateOpListForSale(const TargetAccount: TAccount;
 function TFRMOperation.UpdateOpListForSale(const TargetAccount: TAccount;
   var SalePrice: Int64; var SellerAccount, SignerAccount: TAccount;
   var SalePrice: Int64; var SellerAccount, SignerAccount: TAccount;
   var NewOwnerPublicKey: TAccountKey; var LockedUntilBlock: Cardinal;
   var NewOwnerPublicKey: TAccountKey; var LockedUntilBlock: Cardinal;
-  var errors: AnsiString): Boolean;
+  var errors: String): Boolean;
 var auxC : Cardinal;
 var auxC : Cardinal;
 begin
 begin
   Result := False;
   Result := False;
@@ -1257,7 +1257,7 @@ begin
   End;
   End;
 end;
 end;
 
 
-function TFRMOperation.UpdateOpTransaction(const SenderAccount: TAccount;  var DestAccount: TAccount; var amount: Int64;  var errors: AnsiString): Boolean;
+function TFRMOperation.UpdateOpTransaction(const SenderAccount: TAccount;  var DestAccount: TAccount; var amount: Int64;  var errors: String): Boolean;
 Var c : Cardinal;
 Var c : Cardinal;
 begin
 begin
   Result := False;
   Result := False;
@@ -1298,7 +1298,7 @@ begin
 end;
 end;
 
 
 function TFRMOperation.UpdatePayload(const SenderAccount: TAccount;
 function TFRMOperation.UpdatePayload(const SenderAccount: TAccount;
-  var errors: AnsiString): Boolean;
+  var errors: String): Boolean;
 Var payload_u : AnsiString;
 Var payload_u : AnsiString;
   payload_encrypted : TRawBytes;
   payload_encrypted : TRawBytes;
   account : TAccount;
   account : TAccount;

+ 3 - 3
src/gui-classic/UFRMOperationsExplorer.pas

@@ -357,7 +357,7 @@ Var op : TPCOperation;
   aux : String;
   aux : String;
   nAccount,n_operation : Cardinal;
   nAccount,n_operation : Cardinal;
   changes : TMultiOpChangesInfo;
   changes : TMultiOpChangesInfo;
-  new_name, errors : AnsiString;
+  new_name, errors : String;
   new_type : Word;
   new_type : Word;
   new_account_key : TAccountKey;
   new_account_key : TAccountKey;
 label LBL_start_changer;
 label LBL_start_changer;
@@ -494,7 +494,7 @@ end;
 
 
 procedure TFRMOperationsExplorer.ActExecuteOperationExecute(Sender: TObject);
 procedure TFRMOperationsExplorer.ActExecuteOperationExecute(Sender: TObject);
 Var op : TPCOperation;
 Var op : TPCOperation;
-  errors : AnsiString;
+  errors : String;
 begin
 begin
   If Not Assigned(FSourceNode) then Raise Exception.Create('No node to Execute');
   If Not Assigned(FSourceNode) then Raise Exception.Create('No node to Execute');
   op := GetSelectedOperation;
   op := GetSelectedOperation;
@@ -531,7 +531,7 @@ Var i : Integer;
   raw : TRawBytes;
   raw : TRawBytes;
   aux : AnsiString;
   aux : AnsiString;
   auxS : String;
   auxS : String;
-  errors : AnsiString;
+  errors : String;
   opht : TOperationsHashTree;
   opht : TOperationsHashTree;
   ms : TMemoryStream;
   ms : TMemoryStream;
 begin
 begin

+ 3 - 3
src/gui-classic/UFRMRandomOperations.pas

@@ -130,7 +130,7 @@ procedure TRandomGeneratorThread.BCExecute;
 Var nCounter, nTotalRound, iLastSend, i : Integer;
 Var nCounter, nTotalRound, iLastSend, i : Integer;
   operationsComp : TPCOperationsComp;
   operationsComp : TPCOperationsComp;
   ohtToAdd : TOperationsHashTree;
   ohtToAdd : TOperationsHashTree;
-  errors : AnsiString;
+  errors : String;
   nAddedOperations : Integer;
   nAddedOperations : Integer;
 begin
 begin
   operationsComp := TPCOperationsComp.Create(Nil);
   operationsComp := TPCOperationsComp.Create(Nil);
@@ -292,7 +292,7 @@ var nAccount, nAccountTarget : Cardinal;
   opTx : TOpTransaction;
   opTx : TOpTransaction;
   senderAcc : TAccount;
   senderAcc : TAccount;
   amount,fees : Int64;
   amount,fees : Int64;
-  errors : AnsiString;
+  errors : String;
 begin
 begin
   Result := 0;
   Result := 0;
   If Not GetRandomSigner(operationsComp,aWalletKeys,iKey,nAccount) then Exit;
   If Not GetRandomSigner(operationsComp,aWalletKeys,iKey,nAccount) then Exit;
@@ -350,7 +350,7 @@ Var opMulti : TOpMultiOperation;
   receiver : TMultiOpReceiver;
   receiver : TMultiOpReceiver;
   changer: TMultiOpChangeInfo;
   changer: TMultiOpChangeInfo;
   acc : TAccount;
   acc : TAccount;
-  errors : AnsiString;
+  errors : String;
 begin
 begin
   Result := False;
   Result := False;
   opMulti := TOpMultiOperation.Create;
   opMulti := TOpMultiOperation.Create;

+ 7 - 7
src/gui-classic/UFRMWallet.pas

@@ -333,7 +333,7 @@ Type
   private
   private
     FLastTC : TTickCount;
     FLastTC : TTickCount;
     FLastMsg : String;
     FLastMsg : String;
-    procedure OnProgressNotify(sender : TObject; const mesage : AnsiString; curPos, totalCount : Int64);
+    procedure OnProgressNotify(sender : TObject; const mesage : String; curPos, totalCount : Int64);
     procedure ThreadSafeNotify;
     procedure ThreadSafeNotify;
   protected
   protected
     procedure BCExecute; override;
     procedure BCExecute; override;
@@ -341,7 +341,7 @@ Type
 
 
 { TThreadActivate }
 { TThreadActivate }
 
 
-procedure TThreadActivate.OnProgressNotify(sender: TObject; const mesage: AnsiString; curPos, totalCount: Int64);
+procedure TThreadActivate.OnProgressNotify(sender: TObject; const mesage: String; curPos, totalCount: Int64);
 var pct : String;
 var pct : String;
 begin
 begin
   If TPlatform.GetElapsedMilliseconds(FLastTC)>500 then begin
   If TPlatform.GetElapsedMilliseconds(FLastTC)>500 then begin
@@ -363,7 +363,7 @@ begin
 end;
 end;
 
 
 procedure TThreadActivate.BCExecute;
 procedure TThreadActivate.BCExecute;
-Var currentProcess : AnsiString;
+Var currentProcess : String;
 begin
 begin
   FLastTC := 0;
   FLastTC := 0;
   FLastMsg := '';
   FLastMsg := '';
@@ -500,7 +500,7 @@ end;
 
 
 procedure TFRMWallet.bbSendAMessageClick(Sender: TObject);
 procedure TFRMWallet.bbSendAMessageClick(Sender: TObject);
 Var basem,m : String;
 Var basem,m : String;
-  them, errors : AnsiString;
+  them, errors : String;
   i,n : Integer;
   i,n : Integer;
   nc : TNetConnection;
   nc : TNetConnection;
 begin
 begin
@@ -565,7 +565,7 @@ begin
 end;
 end;
 
 
 procedure TFRMWallet.CheckIsReady;
 procedure TFRMWallet.CheckIsReady;
-Var isready : AnsiString;
+Var isready : String;
 begin
 begin
   if Not Assigned(FNode) then Abort;
   if Not Assigned(FNode) then Abort;
 
 
@@ -2205,7 +2205,7 @@ begin
 end;
 end;
 
 
 procedure TFRMWallet.UpdateConnectionStatus;
 procedure TFRMWallet.UpdateConnectionStatus;
-var errors : AnsiString;
+var errors : String;
 begin
 begin
   UpdateNodeStatus;
   UpdateNodeStatus;
   OnNetStatisticsChanged(Nil);
   OnNetStatisticsChanged(Nil);
@@ -2222,7 +2222,7 @@ begin
 end;
 end;
 
 
 procedure TFRMWallet.UpdateNodeStatus;
 procedure TFRMWallet.UpdateNodeStatus;
-Var status : AnsiString;
+Var status : String;
 begin
 begin
   If Not Assigned(FNode) then begin
   If Not Assigned(FNode) then begin
     lblNodeStatus.Font.Color := clRed;
     lblNodeStatus.Font.Color := clRed;

+ 1 - 1
src/gui-classic/UFRMWalletKeys.pas

@@ -370,7 +370,7 @@ var s : String;
  raw : TRawBytes;
  raw : TRawBytes;
  EC : TECPrivateKey;
  EC : TECPrivateKey;
  account : TAccountKey;
  account : TAccountKey;
- errors : AnsiString;
+ errors : String;
 begin
 begin
   CheckIsWalletKeyValidPassword;
   CheckIsWalletKeyValidPassword;
   if Not Assigned(WalletKeys) then exit;
   if Not Assigned(WalletKeys) then exit;