Index: src/exceptions/OFAcceptFailedException.h ================================================================== --- src/exceptions/OFAcceptFailedException.h +++ src/exceptions/OFAcceptFailedException.h @@ -26,11 +26,11 @@ OFTCPSocket *socket; int errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFTCPSocket *socket; +@property (readonly, retain, nonatomic) OFTCPSocket *socket; @property (readonly) int errNo; #endif /** * \param class_ The class of the object which caused the exception Index: src/exceptions/OFAcceptFailedException.m ================================================================== --- src/exceptions/OFAcceptFailedException.m +++ src/exceptions/OFAcceptFailedException.m @@ -70,13 +70,13 @@ return description; } - (OFTCPSocket*)socket { - return socket; + OF_GETTER(socket, NO) } - (int)errNo { return errNo; } @end Index: src/exceptions/OFAddressTranslationFailedException.h ================================================================== --- src/exceptions/OFAddressTranslationFailedException.h +++ src/exceptions/OFAddressTranslationFailedException.h @@ -27,12 +27,12 @@ OFString *host; int errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFTCPSocket *socket; -@property (readonly, assign) OFString *host; +@property (readonly, retain, nonatomic) OFTCPSocket *socket; +@property (readonly, copy, nonatomic) OFString *host; @property (readonly) int errNo; #endif /** * \param class_ The class of the object which caused the exception Index: src/exceptions/OFAddressTranslationFailedException.m ================================================================== --- src/exceptions/OFAddressTranslationFailedException.m +++ src/exceptions/OFAddressTranslationFailedException.m @@ -87,11 +87,11 @@ return description; } - (OFTCPSocket*)socket { - return socket; + OF_GETTER(socket, NO) } - (OFString*)host { return host; Index: src/exceptions/OFAlreadyConnectedException.h ================================================================== --- src/exceptions/OFAlreadyConnectedException.h +++ src/exceptions/OFAlreadyConnectedException.h @@ -26,11 +26,11 @@ { OFTCPSocket *socket; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFTCPSocket *socket; +@property (readonly, retain, nonatomic) OFTCPSocket *socket; #endif /** * \param class_ The class of the object which caused the exception * \param socket The socket which is already connected Index: src/exceptions/OFAlreadyConnectedException.m ================================================================== --- src/exceptions/OFAlreadyConnectedException.m +++ src/exceptions/OFAlreadyConnectedException.m @@ -67,8 +67,8 @@ return description; } - (OFTCPSocket*)socket { - return socket; + OF_GETTER(socket, NO) } @end Index: src/exceptions/OFBindFailedException.h ================================================================== --- src/exceptions/OFBindFailedException.h +++ src/exceptions/OFBindFailedException.h @@ -28,12 +28,12 @@ uint16_t port; int errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFTCPSocket *socket; -@property (readonly, assign) OFString *host; +@property (readonly, retain, nonatomic) OFTCPSocket *socket; +@property (readonly, copy, nonatomic) OFString *host; @property (readonly) uint16_t port; @property (readonly) int errNo; #endif /** Index: src/exceptions/OFBindFailedException.m ================================================================== --- src/exceptions/OFBindFailedException.m +++ src/exceptions/OFBindFailedException.m @@ -84,16 +84,16 @@ return description; } - (OFTCPSocket*)socket { - return socket; + OF_GETTER(socket, NO) } - (OFString*)host { - return host; + OF_GETTER(host, NO) } - (uint16_t)port { return port; Index: src/exceptions/OFChangeDirectoryFailedException.h ================================================================== --- src/exceptions/OFChangeDirectoryFailedException.h +++ src/exceptions/OFChangeDirectoryFailedException.h @@ -24,11 +24,11 @@ OFString *path; int errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFString *path; +@property (readonly, copy, nonatomic) OFString *path; @property (readonly) int errNo; #endif /** * \param class_ The class of the object which caused the exception Index: src/exceptions/OFChangeDirectoryFailedException.m ================================================================== --- src/exceptions/OFChangeDirectoryFailedException.m +++ src/exceptions/OFChangeDirectoryFailedException.m @@ -79,8 +79,8 @@ return errNo; } - (OFString*)path { - return path; + OF_GETTER(path, NO) } @end Index: src/exceptions/OFChangeFileModeFailedException.h ================================================================== --- src/exceptions/OFChangeFileModeFailedException.h +++ src/exceptions/OFChangeFileModeFailedException.h @@ -27,11 +27,11 @@ mode_t mode; int errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFString *path; +@property (readonly, copy, nonatomic) OFString *path; @property (readonly) mode_t mode; @property (readonly) int errNo; #endif /** Index: src/exceptions/OFChangeFileModeFailedException.m ================================================================== --- src/exceptions/OFChangeFileModeFailedException.m +++ src/exceptions/OFChangeFileModeFailedException.m @@ -83,13 +83,13 @@ return errNo; } - (OFString*)path { - return path; + OF_GETTER(path, NO) } - (mode_t)mode { return mode; } @end Index: src/exceptions/OFChangeFileOwnerFailedException.h ================================================================== --- src/exceptions/OFChangeFileOwnerFailedException.h +++ src/exceptions/OFChangeFileOwnerFailedException.h @@ -27,13 +27,13 @@ OFString *group; int errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFString *path; -@property (readonly, assign) OFString *owner; -@property (readonly, assign) OFString *group; +@property (readonly, copy, nonatomic) OFString *path; +@property (readonly, copy, nonatomic) OFString *owner; +@property (readonly, copy, nonatomic) OFString *group; @property (readonly) int errNo; #endif /** * \param class_ The class of the object which caused the exception Index: src/exceptions/OFChangeFileOwnerFailedException.m ================================================================== --- src/exceptions/OFChangeFileOwnerFailedException.m +++ src/exceptions/OFChangeFileOwnerFailedException.m @@ -99,19 +99,19 @@ return errNo; } - (OFString*)path { - return path; + OF_GETTER(path, NO) } - (OFString*)owner { - return owner; + OF_GETTER(owner, NO) } - (OFString*)group { - return group; + OF_GETTER(group, NO) } @end #endif Index: src/exceptions/OFConditionBroadcastFailedException.h ================================================================== --- src/exceptions/OFConditionBroadcastFailedException.h +++ src/exceptions/OFConditionBroadcastFailedException.h @@ -25,11 +25,11 @@ { OFCondition *condition; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFCondition *condition; +@property (readonly, retain, nonatomic) OFCondition *condition; #endif /** * \param class_ The class of the object which caused the exception * \param condition The condition which could not be broadcasted Index: src/exceptions/OFConditionBroadcastFailedException.m ================================================================== --- src/exceptions/OFConditionBroadcastFailedException.m +++ src/exceptions/OFConditionBroadcastFailedException.m @@ -66,8 +66,8 @@ return description; } - (OFCondition*)condition { - return condition; + OF_GETTER(condition, NO) } @end Index: src/exceptions/OFConditionSignalFailedException.h ================================================================== --- src/exceptions/OFConditionSignalFailedException.h +++ src/exceptions/OFConditionSignalFailedException.h @@ -25,11 +25,11 @@ { OFCondition *condition; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFCondition *condition; +@property (readonly, retain, nonatomic) OFCondition *condition; #endif /** * \param class_ The class of the object which caused the exception * \param condition The condition which could not be signaled Index: src/exceptions/OFConditionSignalFailedException.m ================================================================== --- src/exceptions/OFConditionSignalFailedException.m +++ src/exceptions/OFConditionSignalFailedException.m @@ -66,8 +66,8 @@ return description; } - (OFCondition*)condition { - return condition; + OF_GETTER(condition, NO) } @end Index: src/exceptions/OFConditionStillWaitingException.h ================================================================== --- src/exceptions/OFConditionStillWaitingException.h +++ src/exceptions/OFConditionStillWaitingException.h @@ -26,11 +26,11 @@ { OFCondition *condition; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFCondition *condition; +@property (readonly, retain, nonatomic) OFCondition *condition; #endif /** * \param class_ The class of the object which caused the exception * \param condition The condition for which is still being waited Index: src/exceptions/OFConditionStillWaitingException.m ================================================================== --- src/exceptions/OFConditionStillWaitingException.m +++ src/exceptions/OFConditionStillWaitingException.m @@ -67,8 +67,8 @@ return description; } - (OFCondition*)condition { - return condition; + OF_GETTER(condition, NO) } @end Index: src/exceptions/OFConditionWaitFailedException.h ================================================================== --- src/exceptions/OFConditionWaitFailedException.h +++ src/exceptions/OFConditionWaitFailedException.h @@ -25,11 +25,11 @@ { OFCondition *condition; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFCondition *condition; +@property (readonly, retain, nonatomic) OFCondition *condition; #endif /** * \param class_ The class of the object which caused the exception * \param condition The condition for which could not be waited Index: src/exceptions/OFConditionWaitFailedException.m ================================================================== --- src/exceptions/OFConditionWaitFailedException.m +++ src/exceptions/OFConditionWaitFailedException.m @@ -66,8 +66,8 @@ return description; } - (OFCondition*)condition { - return condition; + OF_GETTER(condition, NO) } @end Index: src/exceptions/OFConnectionFailedException.h ================================================================== --- src/exceptions/OFConnectionFailedException.h +++ src/exceptions/OFConnectionFailedException.h @@ -28,12 +28,12 @@ uint16_t port; int errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFTCPSocket *socket; -@property (readonly, assign) OFString *host; +@property (readonly, retain, nonatomic) OFTCPSocket *socket; +@property (readonly, copy, nonatomic) OFString *host; @property (readonly) uint16_t port; @property (readonly) int errNo; #endif /** Index: src/exceptions/OFConnectionFailedException.m ================================================================== --- src/exceptions/OFConnectionFailedException.m +++ src/exceptions/OFConnectionFailedException.m @@ -84,16 +84,16 @@ return description; } - (OFTCPSocket*)socket { - return socket; + OF_GETTER(socket, NO) } - (OFString*)host { - return host; + OF_GETTER(host, NO) } - (uint16_t)port { return port; Index: src/exceptions/OFCopyFileFailedException.h ================================================================== --- src/exceptions/OFCopyFileFailedException.h +++ src/exceptions/OFCopyFileFailedException.h @@ -25,12 +25,12 @@ OFString *destinationPath; int errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFString *sourcePath; -@property (readonly, assign) OFString *destinationPath; +@property (readonly, copy, nonatomic) OFString *sourcePath; +@property (readonly, copy, nonatomic) OFString *destinationPath; @property (readonly) int errNo; #endif /** * \param class_ The class of the object which caused the exception Index: src/exceptions/OFCopyFileFailedException.m ================================================================== --- src/exceptions/OFCopyFileFailedException.m +++ src/exceptions/OFCopyFileFailedException.m @@ -84,13 +84,13 @@ return errNo; } - (OFString*)sourcePath { - return sourcePath; + OF_GETTER(sourcePath, NO) } - (OFString*)destinationPath { - return destinationPath; + OF_GETTER(destinationPath, NO) } @end Index: src/exceptions/OFCreateDirectoryFailedException.h ================================================================== --- src/exceptions/OFCreateDirectoryFailedException.h +++ src/exceptions/OFCreateDirectoryFailedException.h @@ -24,11 +24,11 @@ OFString *path; int errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFString *path; +@property (readonly, copy, nonatomic) OFString *path; @property (readonly) int errNo; #endif /** * \param class_ The class of the object which caused the exception Index: src/exceptions/OFCreateDirectoryFailedException.m ================================================================== --- src/exceptions/OFCreateDirectoryFailedException.m +++ src/exceptions/OFCreateDirectoryFailedException.m @@ -79,8 +79,8 @@ return errNo; } - (OFString*)path { - return path; + OF_GETTER(path, NO) } @end Index: src/exceptions/OFDeleteDirectoryFailedException.h ================================================================== --- src/exceptions/OFDeleteDirectoryFailedException.h +++ src/exceptions/OFDeleteDirectoryFailedException.h @@ -24,11 +24,11 @@ OFString *path; int errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFString *path; +@property (readonly, copy, nonatomic) OFString *path; @property (readonly) int errNo; #endif /** * \param class_ The class of the object which caused the exception Index: src/exceptions/OFDeleteDirectoryFailedException.m ================================================================== --- src/exceptions/OFDeleteDirectoryFailedException.m +++ src/exceptions/OFDeleteDirectoryFailedException.m @@ -79,8 +79,8 @@ return errNo; } - (OFString*)path { - return path; + OF_GETTER(path, NO) } @end Index: src/exceptions/OFDeleteFileFailedException.h ================================================================== --- src/exceptions/OFDeleteFileFailedException.h +++ src/exceptions/OFDeleteFileFailedException.h @@ -24,11 +24,11 @@ OFString *path; int errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFString *path; +@property (readonly, copy, nonatomic) OFString *path; @property (readonly) int errNo; #endif /** * \param class_ The class of the object which caused the exception Index: src/exceptions/OFDeleteFileFailedException.m ================================================================== --- src/exceptions/OFDeleteFileFailedException.m +++ src/exceptions/OFDeleteFileFailedException.m @@ -79,8 +79,8 @@ return errNo; } - (OFString*)path { - return path; + OF_GETTER(path, NO) } @end Index: src/exceptions/OFEnumerationMutationException.h ================================================================== --- src/exceptions/OFEnumerationMutationException.h +++ src/exceptions/OFEnumerationMutationException.h @@ -22,10 +22,14 @@ */ @interface OFEnumerationMutationException: OFException { id object; } + +#ifdef OF_HAVE_PROPERTIES +@property (readonly, retain, nonatomic) id object; +#endif /** * \param class_ The class of the object which caused the exception * \param object The object which was mutated during enumeration * \return A new enumeration mutation exception Index: src/exceptions/OFEnumerationMutationException.m ================================================================== --- src/exceptions/OFEnumerationMutationException.m +++ src/exceptions/OFEnumerationMutationException.m @@ -65,8 +65,8 @@ return description; } - (id)object { - return object; + OF_GETTER(object, NO) } @end Index: src/exceptions/OFHTTPRequestFailedException.h ================================================================== --- src/exceptions/OFHTTPRequestFailedException.h +++ src/exceptions/OFHTTPRequestFailedException.h @@ -27,12 +27,12 @@ OFHTTPRequest *HTTPRequest; OFHTTPRequestResult *result; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFHTTPRequest *HTTPRequest; -@property (readonly, assign) OFHTTPRequestResult *result; +@property (readonly, retain, nonatomic) OFHTTPRequest *HTTPRequest; +@property (readonly, retain, nonatomic) OFHTTPRequestResult *result; #endif /** * \param class_ The class of the object which caused the exception * \param request The HTTP request which failed Index: src/exceptions/OFHTTPRequestFailedException.m ================================================================== --- src/exceptions/OFHTTPRequestFailedException.m +++ src/exceptions/OFHTTPRequestFailedException.m @@ -93,13 +93,13 @@ return description; } - (OFHTTPRequest*)HTTPRequest { - return HTTPRequest; + OF_GETTER(HTTPRequest, NO) } - (OFHTTPRequestResult*)result { - return result; + OF_GETTER(result, NO) } @end Index: src/exceptions/OFHashAlreadyCalculatedException.h ================================================================== --- src/exceptions/OFHashAlreadyCalculatedException.h +++ src/exceptions/OFHashAlreadyCalculatedException.h @@ -25,11 +25,11 @@ { OFHash *hashObject; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFHash *hashObject; +@property (readonly, retain, nonatomic) OFHash *hashObject; #endif /** * \param class_ The class of the object which caused the exception * \param hash The hash which has already been calculated Index: src/exceptions/OFHashAlreadyCalculatedException.m ================================================================== --- src/exceptions/OFHashAlreadyCalculatedException.m +++ src/exceptions/OFHashAlreadyCalculatedException.m @@ -67,8 +67,8 @@ return description; } - (OFHash*)hashObject { - return hashObject; + OF_GETTER(hashObject, NO) } @end Index: src/exceptions/OFLinkFailedException.h ================================================================== --- src/exceptions/OFLinkFailedException.h +++ src/exceptions/OFLinkFailedException.h @@ -26,12 +26,12 @@ OFString *destinationPath; int errNo; } # ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFString *sourcePath; -@property (readonly, assign) OFString *destinationPath; +@property (readonly, copy, nonatomic) OFString *sourcePath; +@property (readonly, copy, nonatomic) OFString *destinationPath; @property (readonly) int errNo; # endif /** * \param class_ The class of the object which caused the exception Index: src/exceptions/OFLinkFailedException.m ================================================================== --- src/exceptions/OFLinkFailedException.m +++ src/exceptions/OFLinkFailedException.m @@ -85,14 +85,14 @@ return errNo; } - (OFString*)sourcePath { - return sourcePath; + OF_GETTER(sourcePath, NO) } - (OFString*)destinationPath { - return destinationPath; + OF_GETTER(destinationPath, NO) } @end #endif Index: src/exceptions/OFListenFailedException.h ================================================================== --- src/exceptions/OFListenFailedException.h +++ src/exceptions/OFListenFailedException.h @@ -27,11 +27,11 @@ int backLog; int errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFTCPSocket *socket; +@property (readonly, retain, nonatomic) OFTCPSocket *socket; @property (readonly) int backLog; @property (readonly) int errNo; #endif /** Index: src/exceptions/OFListenFailedException.m ================================================================== --- src/exceptions/OFListenFailedException.m +++ src/exceptions/OFListenFailedException.m @@ -74,11 +74,11 @@ return description; } - (OFTCPSocket*)socket { - return socket; + OF_GETTER(socket, NO) } - (int)backLog { return backLog; Index: src/exceptions/OFMalformedXMLException.h ================================================================== --- src/exceptions/OFMalformedXMLException.h +++ src/exceptions/OFMalformedXMLException.h @@ -25,11 +25,11 @@ { OFXMLParser *parser; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFXMLParser *parser; +@property (readonly, retain, nonatomic) OFXMLParser *parser; #endif /** * \param parser The parser which encountered malformed XML * \return A new malformed XML exception Index: src/exceptions/OFMalformedXMLException.m ================================================================== --- src/exceptions/OFMalformedXMLException.m +++ src/exceptions/OFMalformedXMLException.m @@ -62,8 +62,8 @@ return description; } - (OFXMLParser*)parser { - return parser; + OF_GETTER(parser, NO) } @end Index: src/exceptions/OFMutexLockFailedException.h ================================================================== --- src/exceptions/OFMutexLockFailedException.h +++ src/exceptions/OFMutexLockFailedException.h @@ -25,11 +25,11 @@ { OFMutex *mutex; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFMutex *mutex; +@property (readonly, retain, nonatomic) OFMutex *mutex; #endif /** * \param class_ The class of the object which caused the exception * \param mutex The mutex which is could not be locked Index: src/exceptions/OFMutexLockFailedException.m ================================================================== --- src/exceptions/OFMutexLockFailedException.m +++ src/exceptions/OFMutexLockFailedException.m @@ -66,8 +66,8 @@ return description; } - (OFMutex*)mutex { - return mutex; + OF_GETTER(mutex, NO) } @end Index: src/exceptions/OFMutexStillLockedException.h ================================================================== --- src/exceptions/OFMutexStillLockedException.h +++ src/exceptions/OFMutexStillLockedException.h @@ -25,11 +25,11 @@ { OFMutex *mutex; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFMutex *mutex; +@property (readonly, retain, nonatomic) OFMutex *mutex; #endif /** * \param class_ The class of the object which caused the exception * \param mutex The mutex which is still locked Index: src/exceptions/OFMutexStillLockedException.m ================================================================== --- src/exceptions/OFMutexStillLockedException.m +++ src/exceptions/OFMutexStillLockedException.m @@ -67,8 +67,8 @@ return description; } - (OFMutex*)mutex { - return mutex; + OF_GETTER(mutex, NO) } @end Index: src/exceptions/OFMutexUnlockFailedException.h ================================================================== --- src/exceptions/OFMutexUnlockFailedException.h +++ src/exceptions/OFMutexUnlockFailedException.h @@ -25,11 +25,11 @@ { OFMutex *mutex; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFMutex *mutex; +@property (readonly, retain, nonatomic) OFMutex *mutex; #endif /** * \param class_ The class of the object which caused the exception * \param mutex The mutex which could not be unlocked Index: src/exceptions/OFMutexUnlockFailedException.m ================================================================== --- src/exceptions/OFMutexUnlockFailedException.m +++ src/exceptions/OFMutexUnlockFailedException.m @@ -66,8 +66,8 @@ return description; } - (OFMutex*)mutex { - return mutex; + OF_GETTER(mutex, NO) } @end Index: src/exceptions/OFNotConnectedException.h ================================================================== --- src/exceptions/OFNotConnectedException.h +++ src/exceptions/OFNotConnectedException.h @@ -25,11 +25,11 @@ { OFStreamSocket *socket; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFStreamSocket *socket; +@property (readonly, retain, nonatomic) OFStreamSocket *socket; #endif /** * \param class_ The class of the object which caused the exception * \param socket The socket which is not connected Index: src/exceptions/OFNotConnectedException.m ================================================================== --- src/exceptions/OFNotConnectedException.m +++ src/exceptions/OFNotConnectedException.m @@ -66,8 +66,8 @@ return description; } - (OFStreamSocket*)socket { - return socket; + OF_GETTER(socket, NO) } @end Index: src/exceptions/OFOpenFileFailedException.h ================================================================== --- src/exceptions/OFOpenFileFailedException.h +++ src/exceptions/OFOpenFileFailedException.h @@ -25,12 +25,12 @@ OFString *mode; int errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFString *path; -@property (readonly, assign) OFString *mode; +@property (readonly, copy, nonatomic) OFString *path; +@property (readonly, copy, nonatomic) OFString *mode; @property (readonly) int errNo; #endif /** * \param class_ The class of the object which caused the exception Index: src/exceptions/OFOpenFileFailedException.m ================================================================== --- src/exceptions/OFOpenFileFailedException.m +++ src/exceptions/OFOpenFileFailedException.m @@ -84,13 +84,13 @@ return errNo; } - (OFString*)path { - return path; + OF_GETTER(path, NO) } - (OFString*)mode { - return mode; + OF_GETTER(mode, NO) } @end Index: src/exceptions/OFReadOrWriteFailedException.h ================================================================== --- src/exceptions/OFReadOrWriteFailedException.h +++ src/exceptions/OFReadOrWriteFailedException.h @@ -28,11 +28,11 @@ @public int errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFStream *stream; +@property (readonly, retain, nonatomic) OFStream *stream; @property (readonly) size_t requestedLength; @property (readonly) int errNo; #endif /** Index: src/exceptions/OFReadOrWriteFailedException.m ================================================================== --- src/exceptions/OFReadOrWriteFailedException.m +++ src/exceptions/OFReadOrWriteFailedException.m @@ -66,11 +66,11 @@ [super dealloc]; } - (OFStream*)stream { - return stream; + OF_GETTER(stream, NO) } - (size_t)requestedLength { return requestedLength; Index: src/exceptions/OFRenameFileFailedException.h ================================================================== --- src/exceptions/OFRenameFileFailedException.h +++ src/exceptions/OFRenameFileFailedException.h @@ -25,12 +25,12 @@ OFString *destinationPath; int errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFString *sourcePath; -@property (readonly, assign) OFString *destinationPath; +@property (readonly, copy, nonatomic) OFString *sourcePath; +@property (readonly, copy, nonatomic) OFString *destinationPath; @property (readonly) int errNo; #endif /** * \param class_ The class of the object which caused the exception Index: src/exceptions/OFRenameFileFailedException.m ================================================================== --- src/exceptions/OFRenameFileFailedException.m +++ src/exceptions/OFRenameFileFailedException.m @@ -84,13 +84,13 @@ return errNo; } - (OFString*)sourcePath { - return sourcePath; + OF_GETTER(sourcePath, NO) } - (OFString*)destinationPath { - return destinationPath; + OF_GETTER(destinationPath, NO) } @end Index: src/exceptions/OFSeekFailedException.h ================================================================== --- src/exceptions/OFSeekFailedException.h +++ src/exceptions/OFSeekFailedException.h @@ -30,11 +30,11 @@ int whence; int errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFSeekableStream *stream; +@property (readonly, retain, nonatomic) OFSeekableStream *stream; @property (readonly) off_t offset; @property (readonly) int whence; @property (readonly) int errNo; #endif Index: src/exceptions/OFSeekFailedException.m ================================================================== --- src/exceptions/OFSeekFailedException.m +++ src/exceptions/OFSeekFailedException.m @@ -77,11 +77,11 @@ return description; } - (OFSeekableStream*)stream { - return stream; + OF_GETTER(stream, NO) } - (off_t)offset { return offset; Index: src/exceptions/OFSetOptionFailedException.h ================================================================== --- src/exceptions/OFSetOptionFailedException.h +++ src/exceptions/OFSetOptionFailedException.h @@ -25,11 +25,11 @@ { OFStream *stream; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFStream *stream; +@property (readonly, retain, nonatomic) OFStream *stream; #endif /** * \param stream The stream for which the option could not be set * \return A new set option failed exception Index: src/exceptions/OFSetOptionFailedException.m ================================================================== --- src/exceptions/OFSetOptionFailedException.m +++ src/exceptions/OFSetOptionFailedException.m @@ -66,8 +66,8 @@ return description; } - (OFStream*)stream { - return stream; + OF_GETTER(stream, NO) } @end Index: src/exceptions/OFSymlinkFailedException.h ================================================================== --- src/exceptions/OFSymlinkFailedException.h +++ src/exceptions/OFSymlinkFailedException.h @@ -26,12 +26,12 @@ OFString *destinationPath; int errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFString *sourcePath; -@property (readonly, assign) OFString *destinationPath; +@property (readonly, copy, nonatomic) OFString *sourcePath; +@property (readonly, copy, nonatomic) OFString *destinationPath; @property (readonly) int errNo; #endif /** * \param class_ The class of the object which caused the exception Index: src/exceptions/OFSymlinkFailedException.m ================================================================== --- src/exceptions/OFSymlinkFailedException.m +++ src/exceptions/OFSymlinkFailedException.m @@ -85,14 +85,14 @@ return errNo; } - (OFString*)sourcePath { - return sourcePath; + OF_GETTER(sourcePath, NO) } - (OFString*)destinationPath { - return destinationPath; + OF_GETTER(destinationPath, NO) } @end #endif Index: src/exceptions/OFThreadJoinFailedException.h ================================================================== --- src/exceptions/OFThreadJoinFailedException.h +++ src/exceptions/OFThreadJoinFailedException.h @@ -25,11 +25,11 @@ { OFThread *thread; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFThread *thread; +@property (readonly, retain, nonatomic) OFThread *thread; #endif /** * \param class_ The class of the object which caused the exception * \param thread The thread which could not be joined Index: src/exceptions/OFThreadJoinFailedException.m ================================================================== --- src/exceptions/OFThreadJoinFailedException.m +++ src/exceptions/OFThreadJoinFailedException.m @@ -67,8 +67,8 @@ return description; } - (OFThread*)thread { - return thread; + OF_GETTER(thread, NO) } @end Index: src/exceptions/OFThreadStartFailedException.h ================================================================== --- src/exceptions/OFThreadStartFailedException.h +++ src/exceptions/OFThreadStartFailedException.h @@ -25,11 +25,11 @@ { OFThread *thread; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFThread *thread; +@property (readonly, retain, nonatomic) OFThread *thread; #endif /** * \param class_ The class of the object which caused the exception * \param thread The thread which could not be started Index: src/exceptions/OFThreadStartFailedException.m ================================================================== --- src/exceptions/OFThreadStartFailedException.m +++ src/exceptions/OFThreadStartFailedException.m @@ -66,8 +66,8 @@ return description; } - (OFThread*)thread { - return thread; + OF_GETTER(thread, NO) } @end Index: src/exceptions/OFThreadStillRunningException.h ================================================================== --- src/exceptions/OFThreadStillRunningException.h +++ src/exceptions/OFThreadStillRunningException.h @@ -25,11 +25,11 @@ { OFThread *thread; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFThread *thread; +@property (readonly, retain, nonatomic) OFThread *thread; #endif /** * \param class_ The class of the object which caused the exception * \param thread The thread which is still running Index: src/exceptions/OFThreadStillRunningException.m ================================================================== --- src/exceptions/OFThreadStillRunningException.m +++ src/exceptions/OFThreadStillRunningException.m @@ -67,8 +67,8 @@ return description; } - (OFThread*)thread { - return thread; + OF_GETTER(thread, NO) } @end Index: src/exceptions/OFUnboundNamespaceException.h ================================================================== --- src/exceptions/OFUnboundNamespaceException.h +++ src/exceptions/OFUnboundNamespaceException.h @@ -24,12 +24,12 @@ OFString *ns; OFString *prefix; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign, getter=namespace) OFString *ns; -@property (readonly, assign) OFString *prefix; +@property (readonly, copy, nonatomic, getter=namespace) OFString *ns; +@property (readonly, copy, nonatomic) OFString *prefix; #endif /** * \param class_ The class of the object which caused the exception * \param ns The namespace which is unbound Index: src/exceptions/OFUnboundNamespaceException.m ================================================================== --- src/exceptions/OFUnboundNamespaceException.m +++ src/exceptions/OFUnboundNamespaceException.m @@ -98,13 +98,13 @@ return description; } - (OFString*)namespace { - return ns; + OF_GETTER(ns, NO) } - (OFString*)prefix { - return prefix; + OF_GETTER(prefix, NO) } @end Index: src/exceptions/OFUnsupportedProtocolException.h ================================================================== --- src/exceptions/OFUnsupportedProtocolException.h +++ src/exceptions/OFUnsupportedProtocolException.h @@ -26,11 +26,11 @@ { OFURL *URL; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFURL *URL; +@property (readonly, retain, nonatomic) OFURL *URL; #endif /** * \param class_ The class of the object which caused the exception * \param url The URL whose protocol is unsupported Index: src/exceptions/OFUnsupportedProtocolException.m ================================================================== --- src/exceptions/OFUnsupportedProtocolException.m +++ src/exceptions/OFUnsupportedProtocolException.m @@ -72,8 +72,8 @@ return description; } - (OFURL*)URL { - return URL; + OF_GETTER(URL, NO) } @end Index: src/exceptions/OFUnsupportedVersionException.h ================================================================== --- src/exceptions/OFUnsupportedVersionException.h +++ src/exceptions/OFUnsupportedVersionException.h @@ -24,11 +24,11 @@ { OFString *version; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, assign) OFString *version; +@property (readonly, copy, nonatomic) OFString *version; #endif /** * \param class_ The class of the object which caused the exception * \param version The version which is unsupported Index: src/exceptions/OFUnsupportedVersionException.m ================================================================== --- src/exceptions/OFUnsupportedVersionException.m +++ src/exceptions/OFUnsupportedVersionException.m @@ -71,8 +71,8 @@ return description; } - (OFString*)version { - return version; + OF_GETTER(version, NO) } @end