From 8ea345c02c3b133830afebc7b5e8c0cb5528d8b7 Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Sun, 27 Mar 2011 23:50:14 +0200 Subject: [PATCH] Don't synthesize the getter when the setter isn't synthesized. --- ObjXMPP.xcodeproj/project.pbxproj | 3 +++ src/XMPPJID.m | 19 +++++++++++++++---- src/XMPPStanza.m | 25 ++++++++++++++++++++----- 3 files changed, 38 insertions(+), 9 deletions(-) diff --git a/ObjXMPP.xcodeproj/project.pbxproj b/ObjXMPP.xcodeproj/project.pbxproj index 962a96d..d427aeb 100644 --- a/ObjXMPP.xcodeproj/project.pbxproj +++ b/ObjXMPP.xcodeproj/project.pbxproj @@ -378,6 +378,7 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_VERSION = 4.2; INFOPLIST_FILE = Info.plist; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = framework; @@ -395,6 +396,7 @@ FRAMEWORK_VERSION = A; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_VERSION = 4.2; INFOPLIST_FILE = Info.plist; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = framework; @@ -411,6 +413,7 @@ 4B1295EB1337BD2D00154B25 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; 4BC5598A1337A65400E345C7 /* Build configuration list for PBXProject "ObjXMPP" */ = { isa = XCConfigurationList; diff --git a/src/XMPPJID.m b/src/XMPPJID.m index 65fd60d..9c9ff20 100644 --- a/src/XMPPJID.m +++ b/src/XMPPJID.m @@ -27,10 +27,6 @@ #import "XMPPExceptions.h" @implementation XMPPJID -@synthesize node; -@synthesize domain; -@synthesize resource; - + JID { return [[[self alloc] init] autorelease]; @@ -112,6 +108,11 @@ [old release]; } +- (OFString*)node +{ + return [[node copy] autorelease]; +} + - (void)setDomain: (OFString*)domain_ { OFString *old = domain; @@ -134,6 +135,11 @@ [old release]; } +- (OFString*)domain +{ + return [[node copy] autorelease]; +} + - (void)setResource: (OFString*)resource_ { OFString *old = resource; @@ -163,6 +169,11 @@ [old release]; } +- (OFString*)resource +{ + return [[resource copy] autorelease]; +} + - (OFString*)bareJID { if (node != nil) diff --git a/src/XMPPStanza.m b/src/XMPPStanza.m index 913120c..1dddf38 100644 --- a/src/XMPPStanza.m +++ b/src/XMPPStanza.m @@ -25,11 +25,6 @@ #import "XMPPJID.h" @implementation XMPPStanza -@synthesize from; -@synthesize to; -@synthesize type; -@synthesize ID; - + stanzaWithName: (OFString*)name { return [[[self alloc] initWithName: name] autorelease]; @@ -167,6 +162,11 @@ stringValue: from_.fullJID]; } +- (OFString*)from +{ + return [[from copy] autorelease]; +} + - (void)setTo: (XMPPJID*)to_ { XMPPJID *old = to; @@ -180,6 +180,11 @@ stringValue: to_.fullJID]; } +- (OFString*)to +{ + return [[to copy] autorelease]; +} + - (void)setType: (OFString*)type_ { OFString *old = type; @@ -193,6 +198,11 @@ stringValue: type]; } +- (OFString*)type +{ + return [[type copy] autorelease]; +} + - (void)setID: (OFString*)ID_ { OFString* old = ID; @@ -205,4 +215,9 @@ [self addAttributeWithName: @"id" stringValue: ID]; } + +- (OFString*)ID +{ + return [[ID copy] autorelease]; +} @end