Skip to content
This repository was archived by the owner on Jan 11, 2022. It is now read-only.

Commit 81467ed

Browse files
author
Roberto Schneiders
committed
Renames GetInstance to Instance
1 parent 62987fb commit 81467ed

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

delphi/PusherClient/PusherClient.pas

+8-8
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ TPusherClient = class
2828
procedure Log(Message: string);
2929
procedure ConnectionStateChange(Message: string);
3030
public
31-
class function GetInstance(): TPusherClient;
31+
class function Instance(): TPusherClient;
3232
procedure Connect(Key: string; CustomHost: string = ''; Options: TConnectionOptions = [coUseSSL]);
3333
procedure Disconnect();
3434
procedure Subscribe(Channel, EventName: String; Callback: TCallbackProcedure);
@@ -46,20 +46,20 @@ implementation
4646

4747
procedure OnLogStdCall(Message: pchar); stdcall;
4848
begin
49-
TPusherClient.GetInstance.Log(StrPas(Message));
49+
TPusherClient.Instance.Log(StrPas(Message));
5050
end;
5151

5252
procedure OnErrorStdCall(message: pchar); stdcall;
5353
begin
54-
TPusherClient.GetInstance.Error(StrPas(Message));
54+
TPusherClient.Instance.Error(StrPas(Message));
5555
end;
5656

5757
procedure OnSubscribeEventStdCall(Channel: pchar; EventName: pchar; Message: pchar); stdcall;
5858
var
5959
ErrorMessage: string;
6060
begin
6161
try
62-
TPusherClient.GetInstance.FSubscribed[StrPas(Channel)][StrPas(EventName)](StrPas(Message));
62+
TPusherClient.Instance.FSubscribed[StrPas(Channel)][StrPas(EventName)](StrPas(Message));
6363
except
6464
on E:Exception do
6565
begin
@@ -68,15 +68,15 @@ procedure OnSubscribeEventStdCall(Channel: pchar; EventName: pchar; Message: pch
6868
+ sLineBreak + '[Channel][Event]: Message: [%s][%s]: [%s]'
6969
+ sLineBreak + 'Error: [%s]',
7070
[StrPas(Channel), StrPas(EventName), StrPas(Message), E.Message]);
71-
TPusherClient.GetInstance.Error(ErrorMessage);
72-
TPusherClient.GetInstance.Log(ErrorMessage);
71+
TPusherClient.Instance.Error(ErrorMessage);
72+
TPusherClient.Instance.Log(ErrorMessage);
7373
end;
7474
end;
7575
end;
7676

7777
procedure OnConnectionStateChangeStdCall(message: pchar); stdcall;
7878
begin
79-
TPusherClient.GetInstance.ConnectionStateChange(StrPas(Message));
79+
TPusherClient.Instance.ConnectionStateChange(StrPas(Message));
8080
end;
8181

8282
procedure TPusherClient.Connect(Key, CustomHost: string; Options: TConnectionOptions);
@@ -110,7 +110,7 @@ procedure TPusherClient.Disconnect;
110110
PusherClientNative.Disconnect;
111111
end;
112112

113-
class function TPusherClient.GetInstance: TPusherClient;
113+
class function TPusherClient.Instance: TPusherClient;
114114
begin
115115
if not Assigned(Self.FInstance) then
116116
self.FInstance := TPusherClient.Create;

delphi/example/example.pas

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ procedure TPusherClientExampleForm.Error(Message: string);
113113

114114
procedure TPusherClientExampleForm.InitializePusherClient;
115115
begin
116-
PusherClient := TPusherClient.GetInstance;
116+
PusherClient := TPusherClient.Instance;
117117
PusherClient.OnError := procedure(Message: string)
118118
begin
119119
Error('[ERROR]: ' + Message);

0 commit comments

Comments
 (0)