Index: src/exceptions/OFAcceptFailedException.h ================================================================== --- src/exceptions/OFAcceptFailedException.h +++ src/exceptions/OFAcceptFailedException.h @@ -32,11 +32,11 @@ OFTCPSocket *_socket; int _errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, retain, nonatomic) OFTCPSocket *socket; +@property (readonly, retain) OFTCPSocket *socket; @property (readonly) int errNo; #endif /*! * @brief Creates a new, autoreleased accept failed exception. Index: src/exceptions/OFAcceptFailedException.m ================================================================== --- src/exceptions/OFAcceptFailedException.m +++ src/exceptions/OFAcceptFailedException.m @@ -66,11 +66,11 @@ [_socket class], ERRPARAM]; } - (OFTCPSocket*)socket { - OF_GETTER(_socket, false) + OF_GETTER(_socket, true) } - (int)errNo { #ifdef _WIN32 Index: src/exceptions/OFAddressTranslationFailedException.h ================================================================== --- src/exceptions/OFAddressTranslationFailedException.h +++ src/exceptions/OFAddressTranslationFailedException.h @@ -33,12 +33,12 @@ OFString *_host; int _errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, copy, nonatomic) OFString *host; -@property (readonly, retain, nonatomic) OFTCPSocket *socket; +@property (readonly, copy) OFString *host; +@property (readonly, retain) OFTCPSocket *socket; @property (readonly) int errNo; #endif /*! * @brief Creates a new, autoreleased address translation failed exception. Index: src/exceptions/OFAddressTranslationFailedException.m ================================================================== --- src/exceptions/OFAddressTranslationFailedException.m +++ src/exceptions/OFAddressTranslationFailedException.m @@ -105,16 +105,16 @@ AT_ERRPARAM]; } - (OFString*)host { - OF_GETTER(_host, false) + OF_GETTER(_host, true) } - (OFTCPSocket*)socket { - OF_GETTER(_socket, false) + OF_GETTER(_socket, true) } - (int)errNo { #ifdef _WIN32 Index: src/exceptions/OFAlreadyConnectedException.h ================================================================== --- src/exceptions/OFAlreadyConnectedException.h +++ src/exceptions/OFAlreadyConnectedException.h @@ -30,11 +30,11 @@ { OFTCPSocket *_socket; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, retain, nonatomic) OFTCPSocket *socket; +@property (readonly, retain) OFTCPSocket *socket; #endif /*! * @brief Creates a new, autoreleased already connected exception. * Index: src/exceptions/OFAlreadyConnectedException.m ================================================================== --- src/exceptions/OFAlreadyConnectedException.m +++ src/exceptions/OFAlreadyConnectedException.m @@ -57,8 +57,8 @@ return @"A connection has already been established!"; } - (OFTCPSocket*)socket { - OF_GETTER(_socket, false) + OF_GETTER(_socket, true) } @end Index: src/exceptions/OFBindFailedException.h ================================================================== --- src/exceptions/OFBindFailedException.h +++ src/exceptions/OFBindFailedException.h @@ -34,13 +34,13 @@ uint16_t _port; int _errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, copy, nonatomic) OFString *host; +@property (readonly, copy) OFString *host; @property (readonly) uint16_t port; -@property (readonly, retain, nonatomic) OFTCPSocket *socket; +@property (readonly, retain) OFTCPSocket *socket; @property (readonly) int errNo; #endif /*! * @brief Creates a new, autoreleased bind failed exception. Index: src/exceptions/OFBindFailedException.m ================================================================== --- src/exceptions/OFBindFailedException.m +++ src/exceptions/OFBindFailedException.m @@ -80,21 +80,21 @@ @"type %@! " ERRFMT, _port, _host, [_socket class], ERRPARAM]; } - (OFString*)host { - OF_GETTER(_host, false) + OF_GETTER(_host, true) } - (uint16_t)port { return _port; } - (OFTCPSocket*)socket { - OF_GETTER(_socket, false) + OF_GETTER(_socket, true) } - (int)errNo { #ifdef _WIN32 Index: src/exceptions/OFChangeCurrentDirectoryPathFailedException.h ================================================================== --- src/exceptions/OFChangeCurrentDirectoryPathFailedException.h +++ src/exceptions/OFChangeCurrentDirectoryPathFailedException.h @@ -27,11 +27,11 @@ OFString *_path; int _errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, copy, nonatomic) OFString *path; +@property (readonly, copy) OFString *path; @property (readonly) int errNo; #endif /*! * @brief Creates a new, autoreleased change current directory path failed Index: src/exceptions/OFChangeCurrentDirectoryPathFailedException.m ================================================================== --- src/exceptions/OFChangeCurrentDirectoryPathFailedException.m +++ src/exceptions/OFChangeCurrentDirectoryPathFailedException.m @@ -70,13 +70,13 @@ _path, ERRPARAM]; } - (OFString*)path { - OF_GETTER(_path, false) + OF_GETTER(_path, true) } - (int)errNo { return _errNo; } @end Index: src/exceptions/OFChangeOwnerFailedException.h ================================================================== --- src/exceptions/OFChangeOwnerFailedException.h +++ src/exceptions/OFChangeOwnerFailedException.h @@ -27,11 +27,11 @@ OFString *_path, *_owner, *_group; int _errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, copy, nonatomic) OFString *path, *owner, *group; +@property (readonly, copy) OFString *path, *owner, *group; @property (readonly) int errNo; #endif /*! * @brief Creates a new, autoreleased change owner failed exception. Index: src/exceptions/OFChangeOwnerFailedException.m ================================================================== --- src/exceptions/OFChangeOwnerFailedException.m +++ src/exceptions/OFChangeOwnerFailedException.m @@ -90,24 +90,24 @@ ERRFMT, _path, _owner, _group, ERRPARAM]; } - (OFString*)path { - OF_GETTER(_path, false) + OF_GETTER(_path, true) } - (OFString*)owner { - OF_GETTER(_owner, false) + OF_GETTER(_owner, true) } - (OFString*)group { - OF_GETTER(_group, false) + OF_GETTER(_group, true) } - (int)errNo { return _errNo; } @end #endif Index: src/exceptions/OFChangePermissionsFailedException.h ================================================================== --- src/exceptions/OFChangePermissionsFailedException.h +++ src/exceptions/OFChangePermissionsFailedException.h @@ -30,11 +30,11 @@ mode_t _permissions; int _errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, copy, nonatomic) OFString *path; +@property (readonly, copy) OFString *path; @property (readonly) mode_t permissions; @property (readonly) int errNo; #endif /*! Index: src/exceptions/OFChangePermissionsFailedException.m ================================================================== --- src/exceptions/OFChangePermissionsFailedException.m +++ src/exceptions/OFChangePermissionsFailedException.m @@ -74,11 +74,11 @@ _path, _permissions, ERRPARAM]; } - (OFString*)path { - OF_GETTER(_path, false) + OF_GETTER(_path, true) } - (mode_t)permissions { return _permissions; Index: src/exceptions/OFConditionBroadcastFailedException.h ================================================================== --- src/exceptions/OFConditionBroadcastFailedException.h +++ src/exceptions/OFConditionBroadcastFailedException.h @@ -29,11 +29,11 @@ { OFCondition *_condition; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, retain, nonatomic) OFCondition *condition; +@property (readonly, retain) OFCondition *condition; #endif /*! * @brief Returns a new, autoreleased condition broadcast failed exception. * Index: src/exceptions/OFConditionBroadcastFailedException.m ================================================================== --- src/exceptions/OFConditionBroadcastFailedException.m +++ src/exceptions/OFConditionBroadcastFailedException.m @@ -62,8 +62,8 @@ @"Broadcasting a condition of type %@ failed!", [_condition class]]; } - (OFCondition*)condition { - OF_GETTER(_condition, false) + OF_GETTER(_condition, true) } @end Index: src/exceptions/OFConditionSignalFailedException.h ================================================================== --- src/exceptions/OFConditionSignalFailedException.h +++ src/exceptions/OFConditionSignalFailedException.h @@ -29,11 +29,11 @@ { OFCondition *_condition; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, retain, nonatomic) OFCondition *condition; +@property (readonly, retain) OFCondition *condition; #endif /*! * @brief Creates a new, autoreleased condition signal failed exception. * Index: src/exceptions/OFConditionSignalFailedException.m ================================================================== --- src/exceptions/OFConditionSignalFailedException.m +++ src/exceptions/OFConditionSignalFailedException.m @@ -62,8 +62,8 @@ @"Signaling a condition of type %@ failed!", [_condition class]]; } - (OFCondition*)condition { - OF_GETTER(_condition, false) + OF_GETTER(_condition, true) } @end Index: src/exceptions/OFConditionStillWaitingException.h ================================================================== --- src/exceptions/OFConditionStillWaitingException.h +++ src/exceptions/OFConditionStillWaitingException.h @@ -30,11 +30,11 @@ { OFCondition *_condition; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, retain, nonatomic) OFCondition *condition; +@property (readonly, retain) OFCondition *condition; #endif /*! * @brief Creates a new, autoreleased condition still waiting exception. * Index: src/exceptions/OFConditionStillWaitingException.m ================================================================== --- src/exceptions/OFConditionStillWaitingException.m +++ src/exceptions/OFConditionStillWaitingException.m @@ -63,8 +63,8 @@ @"thread was still waiting for it!", [_condition class]]; } - (OFCondition*)condition { - OF_GETTER(_condition, false) + OF_GETTER(_condition, true) } @end Index: src/exceptions/OFConditionWaitFailedException.h ================================================================== --- src/exceptions/OFConditionWaitFailedException.h +++ src/exceptions/OFConditionWaitFailedException.h @@ -29,11 +29,11 @@ { OFCondition *_condition; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, retain, nonatomic) OFCondition *condition; +@property (readonly, retain) OFCondition *condition; #endif /*! * @brief Creates a new, autoreleased condition wait failed exception. * Index: src/exceptions/OFConditionWaitFailedException.m ================================================================== --- src/exceptions/OFConditionWaitFailedException.m +++ src/exceptions/OFConditionWaitFailedException.m @@ -62,8 +62,8 @@ @"Waiting for a condition of type %@ failed!", [_condition class]]; } - (OFCondition*)condition { - OF_GETTER(_condition, false) + OF_GETTER(_condition, true) } @end Index: src/exceptions/OFConnectionFailedException.h ================================================================== --- src/exceptions/OFConnectionFailedException.h +++ src/exceptions/OFConnectionFailedException.h @@ -34,12 +34,12 @@ uint16_t _port; int _errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, retain, nonatomic) OFTCPSocket *socket; -@property (readonly, copy, nonatomic) OFString *host; +@property (readonly, retain) OFTCPSocket *socket; +@property (readonly, copy) 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 @@ -81,21 +81,21 @@ [_socket class], ERRPARAM]; } - (OFString*)host { - OF_GETTER(_host, false) + OF_GETTER(_host, true) } - (uint16_t)port { return _port; } - (OFTCPSocket*)socket { - OF_GETTER(_socket, false) + OF_GETTER(_socket, true) } - (int)errNo { #ifdef _WIN32 Index: src/exceptions/OFCopyFileFailedException.h ================================================================== --- src/exceptions/OFCopyFileFailedException.h +++ src/exceptions/OFCopyFileFailedException.h @@ -26,12 +26,12 @@ OFString *_sourcePath, *_destinationPath; int _errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, copy, nonatomic) OFString *sourcePath; -@property (readonly, copy, nonatomic) OFString *destinationPath; +@property (readonly, copy) OFString *sourcePath; +@property (readonly, copy) OFString *destinationPath; @property (readonly) int errNo; #endif /*! * @brief Creates a new, autoreleased copy file failed exception. Index: src/exceptions/OFCopyFileFailedException.m ================================================================== --- src/exceptions/OFCopyFileFailedException.m +++ src/exceptions/OFCopyFileFailedException.m @@ -75,18 +75,18 @@ _destinationPath, ERRPARAM]; } - (OFString*)sourcePath { - OF_GETTER(_sourcePath, false) + OF_GETTER(_sourcePath, true) } - (OFString*)destinationPath { - OF_GETTER(_destinationPath, false) + OF_GETTER(_destinationPath, true) } - (int)errNo { return _errNo; } @end Index: src/exceptions/OFCreateDirectoryFailedException.h ================================================================== --- src/exceptions/OFCreateDirectoryFailedException.h +++ src/exceptions/OFCreateDirectoryFailedException.h @@ -26,11 +26,11 @@ OFString *_path; int _errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, copy, nonatomic) OFString *path; +@property (readonly, copy) OFString *path; @property (readonly) int errNo; #endif /*! * @brief Creates a new, autoreleased create directory failed exception. Index: src/exceptions/OFCreateDirectoryFailedException.m ================================================================== --- src/exceptions/OFCreateDirectoryFailedException.m +++ src/exceptions/OFCreateDirectoryFailedException.m @@ -69,13 +69,13 @@ @"Failed to create directory %@! " ERRFMT, _path, ERRPARAM]; } - (OFString*)path { - OF_GETTER(_path, false) + OF_GETTER(_path, true) } - (int)errNo { return _errNo; } @end Index: src/exceptions/OFCreateSymbolicLinkFailedException.h ================================================================== --- src/exceptions/OFCreateSymbolicLinkFailedException.h +++ src/exceptions/OFCreateSymbolicLinkFailedException.h @@ -27,11 +27,11 @@ OFString *_sourcePath, *_destinationPath; int _errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, copy, nonatomic) OFString *sourcePath, *destinationPath; +@property (readonly, copy) OFString *sourcePath, *destinationPath; @property (readonly) int errNo; #endif /*! * @brief Creates a new, autoreleased create symbolic link failed exception. Index: src/exceptions/OFCreateSymbolicLinkFailedException.m ================================================================== --- src/exceptions/OFCreateSymbolicLinkFailedException.m +++ src/exceptions/OFCreateSymbolicLinkFailedException.m @@ -76,19 +76,19 @@ _destinationPath, ERRPARAM]; } - (OFString*)sourcePath { - OF_GETTER(_sourcePath, false) + OF_GETTER(_sourcePath, true) } - (OFString*)destinationPath { - OF_GETTER(_destinationPath, false) + OF_GETTER(_destinationPath, true) } - (int)errNo { return _errNo; } @end #endif Index: src/exceptions/OFEnumerationMutationException.h ================================================================== --- src/exceptions/OFEnumerationMutationException.h +++ src/exceptions/OFEnumerationMutationException.h @@ -24,11 +24,11 @@ { id _object; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, retain, nonatomic) id object; +@property (readonly, retain) id object; #endif /*! * @brief Creates a new, autoreleased enumeration mutation exception. * Index: src/exceptions/OFEnumerationMutationException.m ================================================================== --- src/exceptions/OFEnumerationMutationException.m +++ src/exceptions/OFEnumerationMutationException.m @@ -64,8 +64,8 @@ [_object class]]; } - (id)object { - OF_GETTER(_object, false) + OF_GETTER(_object, true) } @end Index: src/exceptions/OFHTTPRequestFailedException.h ================================================================== --- src/exceptions/OFHTTPRequestFailedException.h +++ src/exceptions/OFHTTPRequestFailedException.h @@ -31,12 +31,12 @@ OFHTTPRequest *_request; OFHTTPResponse *_response; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, retain, nonatomic) OFHTTPRequest *request; -@property (readonly, retain, nonatomic) OFHTTPResponse *response; +@property (readonly, retain) OFHTTPRequest *request; +@property (readonly, retain) OFHTTPResponse *response; #endif /*! * @brief Creates a new, autoreleased HTTP request failed exception. * Index: src/exceptions/OFHTTPRequestFailedException.m ================================================================== --- src/exceptions/OFHTTPRequestFailedException.m +++ src/exceptions/OFHTTPRequestFailedException.m @@ -74,13 +74,13 @@ [_request URL], [_response statusCode]]; } - (OFHTTPRequest*)request { - OF_GETTER(_request, false) + OF_GETTER(_request, true) } - (OFHTTPResponse*)response { - OF_GETTER(_response, false) + OF_GETTER(_response, true) } @end Index: src/exceptions/OFHashAlreadyCalculatedException.h ================================================================== --- src/exceptions/OFHashAlreadyCalculatedException.h +++ src/exceptions/OFHashAlreadyCalculatedException.h @@ -24,11 +24,11 @@ { id _hashObject; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, retain, nonatomic) id hashObject; +@property (readonly, retain) id hashObject; #endif /*! * @brief Creates a new, autoreleased hash already calculated exception. * Index: src/exceptions/OFHashAlreadyCalculatedException.m ================================================================== --- src/exceptions/OFHashAlreadyCalculatedException.m +++ src/exceptions/OFHashAlreadyCalculatedException.m @@ -64,8 +64,8 @@ @"data can be added!", [_hashObject class]]; } - (id )hashObject { - OF_GETTER(_hashObject, false) + OF_GETTER(_hashObject, true) } @end Index: src/exceptions/OFInvalidJSONException.h ================================================================== --- src/exceptions/OFInvalidJSONException.h +++ src/exceptions/OFInvalidJSONException.h @@ -24,11 +24,11 @@ OFString *_string; size_t _line; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, copy, nonatomic) OFString *string; +@property (readonly, copy) OFString *string; @property (readonly) size_t line; #endif /*! * @brief Creates a new, autoreleased invalid JSON exception. Index: src/exceptions/OFInvalidJSONException.m ================================================================== --- src/exceptions/OFInvalidJSONException.m +++ src/exceptions/OFInvalidJSONException.m @@ -18,10 +18,12 @@ #include #import "OFInvalidJSONException.h" #import "OFString.h" + +#import "macros.h" @implementation OFInvalidJSONException + (instancetype)exceptionWithString: (OFString*)string line: (size_t)line { @@ -70,13 +72,13 @@ @"The JSON representation is invalid in line %zu!", _line]; } - (OFString*)string { - return _string; + OF_GETTER(_string, true) } - (size_t)line { return _line; } @end Index: src/exceptions/OFLinkFailedException.h ================================================================== --- src/exceptions/OFLinkFailedException.h +++ src/exceptions/OFLinkFailedException.h @@ -27,11 +27,11 @@ OFString *_sourcePath, *_destinationPath; int _errNo; } # ifdef OF_HAVE_PROPERTIES -@property (readonly, copy, nonatomic) OFString *sourcePath, *destinationPath; +@property (readonly, copy) OFString *sourcePath, *destinationPath; @property (readonly) int errNo; # endif /*! * @brief Creates a new, autoreleased link failed exception. Index: src/exceptions/OFLinkFailedException.m ================================================================== --- src/exceptions/OFLinkFailedException.m +++ src/exceptions/OFLinkFailedException.m @@ -76,19 +76,19 @@ _destinationPath, ERRPARAM]; } - (OFString*)sourcePath { - OF_GETTER(_sourcePath, false) + OF_GETTER(_sourcePath, true) } - (OFString*)destinationPath { - OF_GETTER(_destinationPath, false) + OF_GETTER(_destinationPath, true) } - (int)errNo { return _errNo; } @end #endif Index: src/exceptions/OFListenFailedException.h ================================================================== --- src/exceptions/OFListenFailedException.h +++ src/exceptions/OFListenFailedException.h @@ -32,11 +32,11 @@ OFTCPSocket *_socket; int _backLog, _errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, retain, nonatomic) OFTCPSocket *socket; +@property (readonly, retain) OFTCPSocket *socket; @property (readonly) int backLog, errNo; #endif /*! * @brief Creates a new, autoreleased listen failed exception. Index: src/exceptions/OFListenFailedException.m ================================================================== --- src/exceptions/OFListenFailedException.m +++ src/exceptions/OFListenFailedException.m @@ -70,11 +70,11 @@ ERRFMT, [_socket class], _backLog, ERRPARAM]; } - (OFTCPSocket*)socket { - OF_GETTER(_socket, false) + OF_GETTER(_socket, true) } - (int)backLog { return _backLog; Index: src/exceptions/OFLockFailedException.h ================================================================== --- src/exceptions/OFLockFailedException.h +++ src/exceptions/OFLockFailedException.h @@ -24,11 +24,11 @@ { id _lock; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, retain, nonatomic) id lock; +@property (readonly, retain) id lock; #endif /*! * @brief Creates a new, autoreleased lock failed exception. * Index: src/exceptions/OFLockFailedException.m ================================================================== --- src/exceptions/OFLockFailedException.m +++ src/exceptions/OFLockFailedException.m @@ -52,8 +52,8 @@ return @"A lock could not be locked!"; } - (id )lock { - OF_GETTER(_lock, false) + OF_GETTER(_lock, true) } @end 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, retain, nonatomic) OFXMLParser *parser; +@property (readonly, retain) OFXMLParser *parser; #endif /*! * @brief Creates a new, autoreleased malformed XML exception. * Index: src/exceptions/OFMalformedXMLException.m ================================================================== --- src/exceptions/OFMalformedXMLException.m +++ src/exceptions/OFMalformedXMLException.m @@ -54,8 +54,8 @@ return @"An XML parser encountered malformed XML!"; } - (OFXMLParser*)parser { - OF_GETTER(_parser, false) + OF_GETTER(_parser, true) } @end Index: src/exceptions/OFMemoryNotPartOfObjectException.h ================================================================== --- src/exceptions/OFMemoryNotPartOfObjectException.h +++ src/exceptions/OFMemoryNotPartOfObjectException.h @@ -25,11 +25,11 @@ id _object; } #ifdef OF_HAVE_PROPERTIES @property (readonly) void *pointer; -@property (readonly, retain, nonatomic) id object; +@property (readonly, retain) id object; #endif /*! * @brief Creates a new, autoreleased memory not part of object exception. * Index: src/exceptions/OFMemoryNotPartOfObjectException.m ================================================================== --- src/exceptions/OFMemoryNotPartOfObjectException.m +++ src/exceptions/OFMemoryNotPartOfObjectException.m @@ -18,10 +18,12 @@ #include #import "OFMemoryNotPartOfObjectException.h" #import "OFString.h" + +#import "macros.h" @implementation OFMemoryNotPartOfObjectException + (instancetype)exceptionWithPointer: (void*)pointer object: (id)object { @@ -73,8 +75,8 @@ return _pointer; } - (id)object { - return _object; + OF_GETTER(_object, true) } @end Index: src/exceptions/OFNotConnectedException.h ================================================================== --- src/exceptions/OFNotConnectedException.h +++ src/exceptions/OFNotConnectedException.h @@ -29,11 +29,11 @@ { OFStreamSocket *_socket; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, retain, nonatomic) OFStreamSocket *socket; +@property (readonly, retain) OFStreamSocket *socket; #endif /*! * @brief Creates a new, autoreleased not connected exception. * Index: src/exceptions/OFNotConnectedException.m ================================================================== --- src/exceptions/OFNotConnectedException.m +++ src/exceptions/OFNotConnectedException.m @@ -65,8 +65,8 @@ [_socket class]]; } - (OFStreamSocket*)socket { - OF_GETTER(_socket, false) + OF_GETTER(_socket, true) } @end Index: src/exceptions/OFNotImplementedException.h ================================================================== --- src/exceptions/OFNotImplementedException.h +++ src/exceptions/OFNotImplementedException.h @@ -26,11 +26,11 @@ id _object; } #ifdef OF_HAVE_PROPERTIES @property (readonly) SEL selector; -@property (readonly, retain, nonatomic) id object; +@property (readonly, retain) id object; #endif /*! * @brief Creates a new, autoreleased not implemented exception. * Index: src/exceptions/OFNotImplementedException.m ================================================================== --- src/exceptions/OFNotImplementedException.m +++ src/exceptions/OFNotImplementedException.m @@ -73,8 +73,8 @@ return _selector; } - (id)object { - return _object; + OF_GETTER(_object, true) } @end Index: src/exceptions/OFOpenFileFailedException.h ================================================================== --- src/exceptions/OFOpenFileFailedException.h +++ src/exceptions/OFOpenFileFailedException.h @@ -26,11 +26,11 @@ OFString *_path, *_mode; int _errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, copy, nonatomic) OFString *path, *mode; +@property (readonly, copy) OFString *path, *mode; @property (readonly) int errNo; #endif /*! * @brief Creates a new, autoreleased open file failed exception. Index: src/exceptions/OFOpenFileFailedException.m ================================================================== --- src/exceptions/OFOpenFileFailedException.m +++ src/exceptions/OFOpenFileFailedException.m @@ -75,18 +75,18 @@ ERRPARAM]; } - (OFString*)path { - OF_GETTER(_path, false) + OF_GETTER(_path, true) } - (OFString*)mode { - OF_GETTER(_mode, false) + OF_GETTER(_mode, true) } - (int)errNo { return _errNo; } @end Index: src/exceptions/OFReadOrWriteFailedException.h ================================================================== --- src/exceptions/OFReadOrWriteFailedException.h +++ src/exceptions/OFReadOrWriteFailedException.h @@ -30,11 +30,11 @@ @public int _errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, retain, nonatomic) OFStream *stream; +@property (readonly, retain) 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 @@ -79,11 +79,11 @@ @"%@! " ERRFMT, _requestedLength, [_stream class], ERRPARAM]; } - (OFStream*)stream { - OF_GETTER(_stream, false) + OF_GETTER(_stream, true) } - (size_t)requestedLength { return _requestedLength; Index: src/exceptions/OFRemoveItemFailedException.h ================================================================== --- src/exceptions/OFRemoveItemFailedException.h +++ src/exceptions/OFRemoveItemFailedException.h @@ -26,11 +26,11 @@ OFString *_path; int _errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, copy, nonatomic) OFString *path; +@property (readonly, copy) OFString *path; @property (readonly) int errNo; #endif /*! * @brief Creates a new, autoreleased remove failed exception. Index: src/exceptions/OFRemoveItemFailedException.m ================================================================== --- src/exceptions/OFRemoveItemFailedException.m +++ src/exceptions/OFRemoveItemFailedException.m @@ -69,13 +69,13 @@ @"Failed to remove item at path %@! " ERRFMT, _path, ERRPARAM]; } - (OFString*)path { - OF_GETTER(_path, false) + OF_GETTER(_path, true) } - (int)errNo { return _errNo; } @end Index: src/exceptions/OFRenameItemFailedException.h ================================================================== --- src/exceptions/OFRenameItemFailedException.h +++ src/exceptions/OFRenameItemFailedException.h @@ -26,11 +26,11 @@ OFString *_sourcePath, *_destinationPath; int _errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, copy, nonatomic) OFString *sourcePath, *destinationPath; +@property (readonly, copy) OFString *sourcePath, *destinationPath; @property (readonly) int errNo; #endif /*! * @brief Creates a new, autoreleased rename failed exception. Index: src/exceptions/OFRenameItemFailedException.m ================================================================== --- src/exceptions/OFRenameItemFailedException.m +++ src/exceptions/OFRenameItemFailedException.m @@ -75,18 +75,18 @@ _destinationPath, ERRPARAM]; } - (OFString*)sourcePath { - OF_GETTER(_sourcePath, false) + OF_GETTER(_sourcePath, true) } - (OFString*)destinationPath { - OF_GETTER(_destinationPath, false) + OF_GETTER(_destinationPath, true) } - (int)errNo { return _errNo; } @end Index: src/exceptions/OFSeekFailedException.h ================================================================== --- src/exceptions/OFSeekFailedException.h +++ src/exceptions/OFSeekFailedException.h @@ -31,11 +31,11 @@ off_t _offset; int _whence, _errNo; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, retain, nonatomic) OFSeekableStream *stream; +@property (readonly, retain) OFSeekableStream *stream; @property (readonly) off_t offset; @property (readonly) int whence, errNo; #endif /*! Index: src/exceptions/OFSeekFailedException.m ================================================================== --- src/exceptions/OFSeekFailedException.m +++ src/exceptions/OFSeekFailedException.m @@ -74,11 +74,11 @@ ERRPARAM]; } - (OFSeekableStream*)stream { - OF_GETTER(_stream, false) + OF_GETTER(_stream, true) } - (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, retain, nonatomic) OFStream *stream; +@property (readonly, retain) OFStream *stream; #endif /*! * @brief Creates a new, autoreleased set option failed exception. * Index: src/exceptions/OFSetOptionFailedException.m ================================================================== --- src/exceptions/OFSetOptionFailedException.m +++ src/exceptions/OFSetOptionFailedException.m @@ -65,8 +65,8 @@ [_stream class]]; } - (OFStream*)stream { - OF_GETTER(_stream, false) + OF_GETTER(_stream, true) } @end Index: src/exceptions/OFStillLockedException.h ================================================================== --- src/exceptions/OFStillLockedException.h +++ src/exceptions/OFStillLockedException.h @@ -24,11 +24,11 @@ { id _lock; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, retain, nonatomic) id lock; +@property (readonly, retain) id lock; #endif /*! * @brief Creates a new, autoreleased still locked exception. * Index: src/exceptions/OFStillLockedException.m ================================================================== --- src/exceptions/OFStillLockedException.m +++ src/exceptions/OFStillLockedException.m @@ -54,8 +54,8 @@ @"locked!"; } - (id )lock { - OF_GETTER(_lock, false) + OF_GETTER(_lock, true) } @end Index: src/exceptions/OFThreadJoinFailedException.h ================================================================== --- src/exceptions/OFThreadJoinFailedException.h +++ src/exceptions/OFThreadJoinFailedException.h @@ -29,11 +29,11 @@ { OFThread *_thread; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, retain, nonatomic) OFThread *thread; +@property (readonly, retain) OFThread *thread; #endif /*! * @brief Creates a new, autoreleased thread join failed exception. * Index: src/exceptions/OFThreadJoinFailedException.m ================================================================== --- src/exceptions/OFThreadJoinFailedException.m +++ src/exceptions/OFThreadJoinFailedException.m @@ -63,8 +63,8 @@ @"already waits for the thread to join.", [_thread class]]; } - (OFThread*)thread { - OF_GETTER(_thread, false) + OF_GETTER(_thread, true) } @end Index: src/exceptions/OFThreadStartFailedException.h ================================================================== --- src/exceptions/OFThreadStartFailedException.h +++ src/exceptions/OFThreadStartFailedException.h @@ -29,11 +29,11 @@ { OFThread *_thread; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, retain, nonatomic) OFThread *thread; +@property (readonly, retain) OFThread *thread; #endif /*! * @brief Creates a new, autoreleased thread start failed exception. * Index: src/exceptions/OFThreadStartFailedException.m ================================================================== --- src/exceptions/OFThreadStartFailedException.m +++ src/exceptions/OFThreadStartFailedException.m @@ -62,8 +62,8 @@ @"Starting a thread of type %@ failed!", [_thread class]]; } - (OFThread*)thread { - OF_GETTER(_thread, false) + OF_GETTER(_thread, true) } @end Index: src/exceptions/OFThreadStillRunningException.h ================================================================== --- src/exceptions/OFThreadStillRunningException.h +++ src/exceptions/OFThreadStillRunningException.h @@ -29,11 +29,11 @@ { OFThread *_thread; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, retain, nonatomic) OFThread *thread; +@property (readonly, retain) OFThread *thread; #endif /*! * @brief Creates a new, autoreleased thread still running exception. * Index: src/exceptions/OFThreadStillRunningException.m ================================================================== --- src/exceptions/OFThreadStillRunningException.m +++ src/exceptions/OFThreadStillRunningException.m @@ -63,8 +63,8 @@ @"was still running!", [_thread class]]; } - (OFThread*)thread { - OF_GETTER(_thread, false) + OF_GETTER(_thread, true) } @end Index: src/exceptions/OFUnboundNamespaceException.h ================================================================== --- src/exceptions/OFUnboundNamespaceException.h +++ src/exceptions/OFUnboundNamespaceException.h @@ -27,15 +27,15 @@ OFXMLElement *_element; } #ifdef OF_HAVE_PROPERTIES # ifdef __cplusplus -@property (readonly, copy, nonatomic, getter=namespace) OFString *namespace_; +@property (readonly, copy, getter=namespace) OFString *namespace_; # else -@property (readonly, copy, nonatomic) OFString *namespace; +@property (readonly, copy) OFString *namespace; # endif -@property (readonly, retain, nonatomic) OFXMLElement *element; +@property (readonly, retain) OFXMLElement *element; #endif /*! * @brief Creates a new, autoreleased unbound namespace exception. * Index: src/exceptions/OFUnboundNamespaceException.m ================================================================== --- src/exceptions/OFUnboundNamespaceException.m +++ src/exceptions/OFUnboundNamespaceException.m @@ -75,13 +75,13 @@ _namespace, [_element class]]; } - (OFString*)namespace { - OF_GETTER(_namespace, false) + OF_GETTER(_namespace, true) } - (OFXMLElement*)element { - OF_GETTER(_element, false) + OF_GETTER(_element, true) } @end Index: src/exceptions/OFUnboundPrefixException.h ================================================================== --- src/exceptions/OFUnboundPrefixException.h +++ src/exceptions/OFUnboundPrefixException.h @@ -26,12 +26,12 @@ OFString *_prefix; OFXMLParser *_parser; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, copy, nonatomic) OFString *prefix; -@property (readonly, retain, nonatomic) OFXMLParser *parser; +@property (readonly, copy) OFString *prefix; +@property (readonly, retain) OFXMLParser *parser; #endif /*! * @brief Creates a new, autoreleased unbound prefix exception. * Index: src/exceptions/OFUnboundPrefixException.m ================================================================== --- src/exceptions/OFUnboundPrefixException.m +++ src/exceptions/OFUnboundPrefixException.m @@ -75,13 +75,13 @@ @"line %zu!", [_parser class], _prefix, [_parser lineNumber]]; } - (OFString*)prefix { - OF_GETTER(_prefix, false) + OF_GETTER(_prefix, true) } - (OFXMLParser*)parser { - OF_GETTER(_parser, false) + OF_GETTER(_parser, true) } @end Index: src/exceptions/OFUnlockFailedException.h ================================================================== --- src/exceptions/OFUnlockFailedException.h +++ src/exceptions/OFUnlockFailedException.h @@ -24,11 +24,11 @@ { id _lock; } #ifdef OF_HAVE_PROPERTIES -@property (readonly, retain, nonatomic) id lock; +@property (readonly, retain) id lock; #endif /*! * @brief Creates a new, autoreleased unlock failed exception. * Index: src/exceptions/OFUnlockFailedException.m ================================================================== --- src/exceptions/OFUnlockFailedException.m +++ src/exceptions/OFUnlockFailedException.m @@ -52,8 +52,8 @@ return @"A lock could not be unlocked!"; } - (id )lock { - OF_GETTER(_lock, false) + OF_GETTER(_lock, true) } @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, retain, nonatomic) OFURL *URL; +@property (readonly, retain) OFURL *URL; #endif /*! * @brief Creates a new, autoreleased unsupported protocol exception. * Index: src/exceptions/OFUnsupportedProtocolException.m ================================================================== --- src/exceptions/OFUnsupportedProtocolException.m +++ src/exceptions/OFUnsupportedProtocolException.m @@ -69,8 +69,8 @@ @"The protocol of URL %@ is not supported!", _URL]; } - (OFURL*)URL { - OF_GETTER(_URL, false) + OF_GETTER(_URL, true) } @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, copy, nonatomic) OFString *version; +@property (readonly, copy) OFString *version; #endif /*! * @brief Creates a new, autoreleased unsupported version exception. * Index: src/exceptions/OFUnsupportedVersionException.m ================================================================== --- src/exceptions/OFUnsupportedVersionException.m +++ src/exceptions/OFUnsupportedVersionException.m @@ -69,8 +69,8 @@ _version]; } - (OFString*)version { - OF_GETTER(_version, false) + OF_GETTER(_version, true) } @end