use const strings instead of literals

vasily-popov · Sep 28, 2017 · 4115758 · 4115758
1 parent 65b519a
commit 4115758
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 7 deletions.
diff --git a/Source/VPSocketIOClient.h b/Source/VPSocketIOClient.h
@@ -18,6 +18,15 @@ typedef enum : NSUInteger {
     VPSocketIOClientStatusConnected= 0x4
 } VPSocketIOClientStatus;
 
+
+extern NSString *const kSocketEventConnect;
+extern NSString *const kSocketEventDisconnect;
+extern NSString *const kSocketEventError;
+extern NSString *const kSocketEventReconnect;
+extern NSString *const kSocketEventReconnectAttempt;
+extern NSString *const kSocketEventStatusChange;
+
+
 typedef void (^VPSocketIOVoidHandler)(void);
 typedef void (^VPSocketAnyEventHandler)(VPSocketAnyEvent*event);
 

diff --git a/Source/VPSocketIOClient.m b/Source/VPSocketIOClient.m
@@ -32,6 +32,14 @@
 } VPSocketClientEvent;
 
 
+NSString *const kSocketEventConnect            = @"connect";
+NSString *const kSocketEventDisconnect         = @"disconnect";
+NSString *const kSocketEventError              = @"error";
+NSString *const kSocketEventReconnect          = @"reconnect";
+NSString *const kSocketEventReconnectAttempt   = @"reconnectAttempt";
+NSString *const kSocketEventStatusChange       = @"statusChange";
+
+
 @interface VPSocketIOClient() <VPSocketEngineClient>
 {
     int currentAck;
@@ -184,12 +192,12 @@ -(void)setDefaultValues {
     _waitingPackets = [[NSMutableArray alloc] init];
 
 
-    eventStrings =@{ @(VPSocketClientEventConnect) : @"connect",
-                     @(VPSocketClientEventDisconnect) : @"disconnect",
-                     @(VPSocketClientEventError) : @"error",
-                     @(VPSocketClientEventReconnect) : @"reconnect",
-                     @(VPSocketClientEventReconnectAttempt) : @"reconnectAttempt",
-                     @(VPSocketClientEventStatusChange) : @"statusChange"};
+    eventStrings =@{ @(VPSocketClientEventConnect)          : kSocketEventConnect,
+                     @(VPSocketClientEventDisconnect)       : kSocketEventDisconnect,
+                     @(VPSocketClientEventError)            : kSocketEventError,
+                     @(VPSocketClientEventReconnect)        : kSocketEventReconnect,
+                     @(VPSocketClientEventReconnectAttempt) : kSocketEventReconnectAttempt,
+                     @(VPSocketClientEventStatusChange)     : kSocketEventStatusChange};
 
 
     statusStrings = @{ @(VPSocketIOClientStatusNotConnected) : @"notconnected",

diff --git a/VPSocketIO/ViewController.m b/VPSocketIO/ViewController.m
@@ -47,7 +47,9 @@ -(void)socketExample{
 
 
 
-    [socket on:@"connect" callback:^(NSArray *array, VPSocketAckEmitter *emitter) {
+
+
+    [socket on:kSocketEventConnect callback:^(NSArray *array, VPSocketAckEmitter *emitter) {
         NSLog(@"!!!!socket connected");
     }];
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,7 +47,9 @@ -(void)socketExample{ @@
-        [socket on:@"connect" callback:^(NSArray *array, VPSocketAckEmitter *emitter) {
+        [socket on:kSocketEventConnect callback:^(NSArray *array, VPSocketAckEmitter *emitter) {
             NSLog(@"!!!!socket connected");
         }];
@@ Expand Down @@