@@ -22,9 +22,4 @@ - (NSString *)bare; - (NSString *)full; -- (NSUInteger)hash; -- (BOOL)isEqual:(id)anObject; - -- (NSString *)description; - @end XMPPJID.h @@ -260,10 +260,17 @@ #pragma mark NSObject Methods: //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 +- (unsigned)hash +{ + return [[self full] hash]; +} +#else - (NSUInteger)hash { return [[self full] hash]; } +#endif - (BOOL)isEqual:(id)anObject { XMPPJID.m @@ -145,10 +145,17 @@ #pragma mark NSObject Methods //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -- (NSString *)description +#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 +- (unsigned)hash { - return [NSString stringWithFormat:@"XMPPResource: %@", [jid full]]; + return [jid hash]; +} +#else +- (NSUInteger)hash +{ + return [jid hash]; } +#endif - (BOOL)isEqual:(id)anObject { @@ -162,9 +169,9 @@ return NO; } -- (NSUInteger)hash +- (NSString *)description { - return [jid hash]; + return [NSString stringWithFormat:@"XMPPResource: %@", [jid full]]; } @end XMPPResource.m @@ -350,7 +350,7 @@ <key>_historyCapacity</key> <integer>10</integer> <key>bookmark</key> - <string>DC0E7D4F0EADD85D00B81D90</string> + <string>DC0E7D5E0EADDEA000B81D90</string> <key>history</key> <array> <string>DC433BF40E91828E00F2C4D4</string> @@ -362,7 +362,7 @@ <string>DC0E7D450EADD85D00B81D90</string> <string>DC0E7D460EADD85D00B81D90</string> <string>DC0E7D470EADD85D00B81D90</string> - <string>DC0E7D480EADD85D00B81D90</string> + <string>DC0E7D4F0EADD85D00B81D90</string> </array> <key>prevStack</key> <array> @@ -372,9 +372,6 @@ <string>DC433BFB0E91828E00F2C4D4</string> <string>DC2EA36B0E92257900BB17BF</string> <string>DC2EA36C0E92257900BB17BF</string> - <string>DC0E7D490EADD85D00B81D90</string> - <string>DC0E7D4A0EADD85D00B81D90</string> - <string>DC0E7D4B0EADD85D00B81D90</string> <string>DC0E7D4C0EADD85D00B81D90</string> <string>DC0E7D4D0EADD85D00B81D90</string> <string>DC0E7D4E0EADD85D00B81D90</string> @@ -435,9 +432,9 @@ </array> <key>TableOfContents</key> <array> - <string>DC0E7D500EADD85D00B81D90</string> + <string>DC0E7D5F0EADDEA000B81D90</string> <string>1CE0B1FE06471DED0097A5F4</string> - <string>DC0E7D510EADD85D00B81D90</string> + <string>DC0E7D600EADDEA000B81D90</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> </array> @@ -562,7 +559,7 @@ <key>StatusbarIsVisible</key> <true/> <key>TimeStamp</key> - <real>246274141.31928501</real> + <real>246275740.642658</real> <key>ToolbarDisplayMode</key> <integer>1</integer> <key>ToolbarIsVisible</key> @@ -577,9 +574,6 @@ <integer>5</integer> <key>WindowOrderList</key> <array> - <string>DCF825810D748AB600BFABDE</string> - <string>1C530D57069F1CE1000CFCEE</string> - <string>1CD10A99069EF8BA00B06720</string> <string>/Users/robbie/Programs/Google Code/XMPPFramework/XMPPStream.xcodeproj</string> </array> <key>WindowString</key> XMPPStream.xcodeproj/robbie.mode1v3 @@ -65,8 +65,8 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 246273934; - PBXWorkspaceStateSaveDate = 246273934; + PBXPerProjectTemplateStateSaveDate = 246275740; + PBXWorkspaceStateSaveDate = 246275740; }; perUserProjectItems = { DC0E7D430EADD85D00B81D90 /* PBXTextBookmark */ = DC0E7D430EADD85D00B81D90 /* PBXTextBookmark */; @@ -74,14 +74,11 @@ DC0E7D450EADD85D00B81D90 /* PBXTextBookmark */ = DC0E7D450EADD85D00B81D90 /* PBXTextBookmark */; DC0E7D460EADD85D00B81D90 /* PBXTextBookmark */ = DC0E7D460EADD85D00B81D90 /* PBXTextBookmark */; DC0E7D470EADD85D00B81D90 /* PBXTextBookmark */ = DC0E7D470EADD85D00B81D90 /* PBXTextBookmark */; - DC0E7D480EADD85D00B81D90 /* PBXBookmark */ = DC0E7D480EADD85D00B81D90 /* PBXBookmark */; - DC0E7D490EADD85D00B81D90 /* PBXTextBookmark */ = DC0E7D490EADD85D00B81D90 /* PBXTextBookmark */; - DC0E7D4A0EADD85D00B81D90 /* PBXTextBookmark */ = DC0E7D4A0EADD85D00B81D90 /* PBXTextBookmark */; - DC0E7D4B0EADD85D00B81D90 /* PBXTextBookmark */ = DC0E7D4B0EADD85D00B81D90 /* PBXTextBookmark */; DC0E7D4C0EADD85D00B81D90 /* PBXTextBookmark */ = DC0E7D4C0EADD85D00B81D90 /* PBXTextBookmark */; DC0E7D4D0EADD85D00B81D90 /* PBXTextBookmark */ = DC0E7D4D0EADD85D00B81D90 /* PBXTextBookmark */; DC0E7D4E0EADD85D00B81D90 /* PBXTextBookmark */ = DC0E7D4E0EADD85D00B81D90 /* PBXTextBookmark */; DC0E7D4F0EADD85D00B81D90 /* PBXTextBookmark */ = DC0E7D4F0EADD85D00B81D90 /* PBXTextBookmark */; + DC0E7D5E0EADDEA000B81D90 /* PBXTextBookmark */ = DC0E7D5E0EADDEA000B81D90 /* PBXTextBookmark */; DC2EA3670E92257900BB17BF /* PBXTextBookmark */ = DC2EA3670E92257900BB17BF /* PBXTextBookmark */; DC2EA36B0E92257900BB17BF /* PBXTextBookmark */ = DC2EA36B0E92257900BB17BF /* PBXTextBookmark */; DC2EA36C0E92257900BB17BF /* PBXTextBookmark */ = DC2EA36C0E92257900BB17BF /* PBXTextBookmark */; @@ -160,40 +157,6 @@ vrLen = 1716; vrLoc = 0; }; - DC0E7D480EADD85D00B81D90 /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = DCD8868E0E8CE26A00CD15A2 /* DDXMLNode.h */; - }; - DC0E7D490EADD85D00B81D90 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = DCB73CC30E58ECCF0086B3DC /* NSDataAdditions.m */; - name = "NSDataAdditions.m: 6"; - rLen = 0; - rLoc = 103; - rType = 0; - vrLen = 1135; - vrLoc = 0; - }; - DC0E7D4A0EADD85D00B81D90 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = DCB73CC20E58ECCF0086B3DC /* NSDataAdditions.h */; - name = "NSDataAdditions.h: 1"; - rLen = 218; - rLoc = 0; - rType = 0; - vrLen = 218; - vrLoc = 0; - }; - DC0E7D4B0EADD85D00B81D90 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = DCB73CC30E58ECCF0086B3DC /* NSDataAdditions.m */; - name = "NSDataAdditions.m: 6"; - rLen = 0; - rLoc = 103; - rType = 0; - vrLen = 1135; - vrLoc = 0; - }; DC0E7D4C0EADD85D00B81D90 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = DC0E7D300EADD7DE00B81D90 /* SSCrypto.h */; @@ -234,6 +197,16 @@ vrLen = 1933; vrLoc = 0; }; + DC0E7D5E0EADDEA000B81D90 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = DCD8868E0E8CE26A00CD15A2 /* DDXMLNode.h */; + name = "DDXMLNode.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 1933; + vrLoc = 0; + }; DC2EA3670E92257900BB17BF /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = DCB9BA0B0DDB71E7002DA335 /* XMPPClient.m */; @@ -675,7 +648,7 @@ }; DCD8868E0E8CE26A00CD15A2 /* DDXMLNode.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {826, 2352}}"; + sepNavIntBoundsRect = "{{0, 0}, {826, 2268}}"; sepNavSelRange = "{0, 0}"; sepNavVisRange = "{0, 1933}"; }; XMPPStream.xcodeproj/robbie.pbxuser @@ -6,6 +6,10 @@ @class XMPPPresence; @class XMPPResource; +#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 +#define NSStringCompareOptions unsigned +#endif + @interface XMPPUser : NSObject <NSCoding> { @@ -15,7 +19,11 @@ NSMutableDictionary *resources; XMPPResource *primaryResource; +#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 + int tag; +#else NSInteger tag; +#endif } - (id)initWithJID:(XMPPJID *)jid; @@ -42,7 +50,12 @@ - (NSComparisonResult)compareByAvailabilityName:(XMPPUser *)another; - (NSComparisonResult)compareByAvailabilityName:(XMPPUser *)another options:(NSStringCompareOptions)mask; +#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 +- (int)tag; +- (void)setTag:(int)anInt; +#else - (NSInteger)tag; - (void)setTag:(NSInteger)anInt; +#endif @end XMPPUser.h @@ -73,7 +73,12 @@ itemAttributes = [[coder decodeObjectForKey:@"itemAttributes"] mutableCopy]; resources = [[coder decodeObjectForKey:@"resources"] mutableCopy]; primaryResource = [[coder decodeObjectForKey:@"primaryResource"] retain]; + +#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 + tag = [coder decodeIntForKey:@"tag"]; +#else tag = [coder decodeIntegerForKey:@"tag"]; +#endif } else { @@ -81,7 +86,12 @@ itemAttributes = [[coder decodeObject] mutableCopy]; resources = [[coder decodeObject] mutableCopy]; primaryResource = [[coder decodeObject] retain]; + +#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 + tag = [[coder decodeObject] intValue]; +#else tag = [[coder decodeObject] integerValue]; +#endif } } return self; @@ -95,7 +105,12 @@ [coder encodeObject:itemAttributes forKey:@"itemAttributes"]; [coder encodeObject:resources forKey:@"resources"]; [coder encodeObject:primaryResource forKey:@"primaryResource"]; + +#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 + [coder encodeInt:tag forKey:@"tag"]; +#else [coder encodeInteger:tag forKey:@"tag"]; +#endif } else { @@ -103,7 +118,12 @@ [coder encodeObject:itemAttributes]; [coder encodeObject:resources]; [coder encodeObject:primaryResource]; + +#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 + [coder encodeObject:[NSNumber numberWithInt:tag]]; +#else [coder encodeObject:[NSNumber numberWithInteger:tag]]; +#endif } } @@ -303,10 +323,17 @@ #pragma mark NSObject Methods //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -- (NSString *)description +#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 +- (unsigned)hash { - return [NSString stringWithFormat:@"XMPPUser: %@", [jid bare]]; + return [jid hash]; +} +#else +- (NSUInteger)hash +{ + return [jid hash]; } +#endif - (BOOL)isEqual:(id)anObject { @@ -320,23 +347,37 @@ return NO; } -- (NSUInteger)hash +- (NSString *)description { - return [jid hash]; + return [NSString stringWithFormat:@"XMPPUser: %@", [jid bare]]; } //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// #pragma mark User Defined Content //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 +- (int)tag +{ + return tag; +} +#else - (NSInteger)tag { return tag; } +#endif +#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 +- (void)setTag:(int)anInt +{ + tag = anInt; +} +#else - (void)setTag:(NSInteger)anInt { tag = anInt; } +#endif @end XMPPUser.m 7ca75fb514596cab55936a1ecb84a696c4cc9dd7 deusty deusty@69bd8580-3047-0410-960a-a116b6c96ec9 http://github.com/tinycode/xmppframework/commit/78d5943b25d8830d2e5e4ac28e69f84427b42b1f 78d5943b25d8830d2e5e4ac28e69f84427b42b1f 2008-10-21T03:42:22-07:00 2008-10-21T03:42:22-07:00 Improving Tiger compatibility. git-svn-id: http://xmppframework.googlecode.com/svn/trunk@50 69bd8580-3047-0410-960a-a116b6c96ec9 6cdab4295b6b14fdd01b0da1c7829357c89e6a65 deusty deusty@69bd8580-3047-0410-960a-a116b6c96ec9