Renamed the message class to avoid name clashes

akosma · May 21, 2011 · c7c22af · c7c22af
1 parent da376a3
commit c7c22af
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Classes/Helpers/MessageBroker.h b/Classes/Helpers/MessageBroker.h
@@ -10,13 +10,13 @@
 #import "MessageBrokerDelegate.h"
 
 @class AsyncSocket;
-@class Message;
+@class MessageObject;
 
 @interface MessageBroker : NSObject 
 
 @property (nonatomic, assign) id<MessageBrokerDelegate> delegate;
 
 - (id)initWithAsyncSocket:(AsyncSocket *)socket;
-- (void)sendMessage:(Message *)newMessage;
+- (void)sendMessage:(MessageObject *)newMessage;
 
 @end
diff --git a/Classes/Helpers/MessageBroker.m b/Classes/Helpers/MessageBroker.m
@@ -8,7 +8,7 @@
 
 #import "MessageBroker.h"
 #import "AsyncSocket.h"
-#import "Message.h"
+#import "MessageObject.h"
 
 static const unsigned int MESSAGE_HEADER_SIZE = sizeof(UInt64);
 static const float SOCKET_TIMEOUT = -1.0;
@@ -66,7 +66,7 @@ - (void)dealloc
 
 #pragma mark - Public methods
 
--(void)sendMessage:(Message *)message 
+-(void)sendMessage:(MessageObject *)message 
 {
     [self.messageQueue addObject:message];
     NSData *messageData = [NSKeyedArchiver archivedDataWithRootObject:message];
@@ -124,7 +124,7 @@ - (void)onSocket:(AsyncSocket *)sock didReadData:(NSData *)data withTag:(long)ta
             // Message body. Pass to delegate
             if ([self.delegate respondsToSelector:@selector(messageBroker:didReceiveMessage:)] ) 
             {
-                Message *message = [NSKeyedUnarchiver unarchiveObjectWithData:data];
+                MessageObject *message = [NSKeyedUnarchiver unarchiveObjectWithData:data];
                 [self.delegate messageBroker:self didReceiveMessage:message];
             }
 
@@ -151,7 +151,7 @@ - (void)onSocket:(AsyncSocket *)sock didWriteDataWithTag:(long)tag
     if (tag == 1) 
     {
         // If the message is now complete, remove from queue, and tell the delegate
-        Message *message = [[[self.messageQueue objectAtIndex:0] retain] autorelease];
+        MessageObject *message = [[[self.messageQueue objectAtIndex:0] retain] autorelease];
         [self.messageQueue removeObjectAtIndex:0];
         if ([self.delegate respondsToSelector:@selector(messageBroker:didSendMessage:)])
         {