Index: src/OFApplication.m ================================================================== --- src/OFApplication.m +++ src/OFApplication.m @@ -52,11 +52,11 @@ # define asm __asm__ # include # undef asm #endif -@interface OFApplication (OF_PRIVATE_CATEGORY) +@interface OFApplication () - (void)OF_setArgumentCount: (int*)argc andArgumentValues: (char**[])argv; #ifdef OF_WINDOWS - (void)OF_setArgumentCount: (int)argc andWideArgumentValues: (wchar_t*[])argv; Index: src/OFArray.m ================================================================== --- src/OFArray.m +++ src/OFArray.m @@ -34,11 +34,11 @@ static struct { Class isa; } placeholder; -@interface OFArray (OF_PRIVATE_CATEGORY) +@interface OFArray () - (OFString*)OF_JSONRepresentationWithOptions: (int)options depth: (size_t)depth; @end @interface OFArray_placeholder: OFArray Index: src/OFAutoreleasePool+Private.h ================================================================== --- src/OFAutoreleasePool+Private.h +++ src/OFAutoreleasePool+Private.h @@ -16,11 +16,11 @@ #import "OFAutoreleasePool.h" OF_ASSUME_NONNULL_BEGIN -@interface OFAutoreleasePool (OF_PRIVATE_CATEGORY) +@interface OFAutoreleasePool () + (void)OF_handleThreadTermination; - (void)OF_super_dealloc; @end OF_ASSUME_NONNULL_END Index: src/OFDictionary.m ================================================================== --- src/OFDictionary.m +++ src/OFDictionary.m @@ -32,11 +32,11 @@ static struct { Class isa; } placeholder; -@interface OFDictionary (OF_PRIVATE_CATEGORY) +@interface OFDictionary () - (OFString*)OF_JSONRepresentationWithOptions: (int)options depth: (size_t)depth; @end @interface OFDictionary_placeholder: OFDictionary Index: src/OFHTTPServer.m ================================================================== --- src/OFHTTPServer.m +++ src/OFHTTPServer.m @@ -45,11 +45,11 @@ /* * FIXME: Key normalization replaces headers like "DNT" with "Dnt". * FIXME: Errors are not reported to the user. */ -@interface OFHTTPServer (OF_PRIVATE_CATEGORY) +@interface OFHTTPServer () - (bool)OF_socket: (OFTCPSocket*)socket didAcceptSocket: (OFTCPSocket*)clientSocket exception: (OFException*)exception; @end Index: src/OFINICategory+Private.h ================================================================== --- src/OFINICategory+Private.h +++ src/OFINICategory+Private.h @@ -19,14 +19,14 @@ OF_ASSUME_NONNULL_BEGIN @class OFStream; -@interface OFINICategory (OF_PRIVATE_CATEGORY) +@interface OFINICategory () - (instancetype)OF_init; - (void)OF_parseLine: (OFString*)line; - (bool)OF_writeToStream: (OFStream*)stream encoding: (of_string_encoding_t)encoding first: (bool)first; @end OF_ASSUME_NONNULL_END Index: src/OFINIFile.m ================================================================== --- src/OFINIFile.m +++ src/OFINIFile.m @@ -26,11 +26,11 @@ #import "OFINICategory+Private.h" #import "OFInvalidFormatException.h" #import "OFOpenItemFailedException.h" -@interface OFINIFile (OF_PRIVATE_CATEGORY) +@interface OFINIFile () - (void)OF_parseFile: (OFString*)path encoding: (of_string_encoding_t)encoding; @end static bool Index: src/OFKernelEventObserver+Private.h ================================================================== --- src/OFKernelEventObserver+Private.h +++ src/OFKernelEventObserver+Private.h @@ -16,15 +16,15 @@ #import "OFKernelEventObserver.h" OF_ASSUME_NONNULL_BEGIN -@interface OFKernelEventObserver (OF_PRIVATE_CATEGORY) +@interface OFKernelEventObserver () - (void)OF_addObjectForReading: (id)object; - (void)OF_addObjectForWriting: (id)object; - (void)OF_removeObjectForReading: (id)object; - (void)OF_removeObjectForWriting: (id)object; - (void)OF_processQueueAndStoreRemovedIn: (nullable OFMutableArray*)removed; - (void)OF_processReadBuffers; @end OF_ASSUME_NONNULL_END Index: src/OFMapTable.m ================================================================== --- src/OFMapTable.m +++ src/OFMapTable.m @@ -58,17 +58,17 @@ defaultEqual(void *value1, void *value2) { return (value1 == value2); } -@interface OFMapTable (OF_PRIVATE_CATEGORY) +@interface OFMapTable () - (void)OF_setValue: (void*)value forKey: (void*)key hash: (uint32_t)hash; @end -@interface OFMapTableEnumerator (OF_PRIVATE_CATEGORY) +@interface OFMapTableEnumerator () - (instancetype)OF_initWithMapTable: (OFMapTable*)mapTable buckets: (struct of_map_table_bucket**)buckets capacity: (uint32_t)capacity mutationsPointer: (unsigned long*)mutationsPtr; @end Index: src/OFNull.m ================================================================== --- src/OFNull.m +++ src/OFNull.m @@ -21,11 +21,11 @@ #import "OFXMLElement.h" #import "OFDataArray.h" #import "OFInvalidArgumentException.h" -@interface OFNull (OF_PRIVATE_CATEGORY) +@interface OFNull () - (OFString*)OF_JSONRepresentationWithOptions: (int)options depth: (size_t)depth; @end static OFNull *null = nil; Index: src/OFNumber.m ================================================================== --- src/OFNumber.m +++ src/OFNumber.m @@ -88,11 +88,11 @@ return (t)_value.double_; \ default: \ @throw [OFInvalidFormatException exception]; \ } -@interface OFNumber (OF_PRIVATE_CATEGORY) +@interface OFNumber () - (OFString*)OF_JSONRepresentationWithOptions: (int)options depth: (size_t)depth; @end @implementation OFNumber Index: src/OFProcess.m ================================================================== --- src/OFProcess.m +++ src/OFProcess.m @@ -54,11 +54,11 @@ #if !defined(OF_WINDOWS) && !defined(HAVE_POSIX_SPAWNP) extern char **environ; #endif -@interface OFProcess (OF_PRIVATE_CATEGORY) +@interface OFProcess () #ifndef OF_WINDOWS - (void)OF_getArgV: (char***)argv forProgramName: (OFString*)programName andArguments: (OFArray*)arguments; - (char**)OF_environmentForDictionary: (OFDictionary*)dictionary; Index: src/OFRunLoop+Private.h ================================================================== --- src/OFRunLoop+Private.h +++ src/OFRunLoop+Private.h @@ -20,11 +20,11 @@ # import "OFUDPSocket.h" #endif OF_ASSUME_NONNULL_BEGIN -@interface OFRunLoop (OF_PRIVATE_CATEGORY) +@interface OFRunLoop () + (void)OF_setMainRunLoop: (OFRunLoop*)runLoop; #ifdef OF_HAVE_SOCKETS + (void)OF_addAsyncReadForStream: (OFStream*)stream buffer: (void*)buffer length: (size_t)length Index: src/OFStdIOStream.m ================================================================== --- src/OFStdIOStream.m +++ src/OFStdIOStream.m @@ -35,11 +35,11 @@ OFStdIOStream *of_stdin = nil; OFStdIOStream *of_stdout = nil; OFStdIOStream *of_stderr = nil; -@interface OFStdIOStream (OF_PRIVATE_CATEGORY) +@interface OFStdIOStream () - (instancetype)OF_initWithFileDescriptor: (int)fd; @end void of_log(OFConstantString *format, ...) Index: src/OFStream+Private.h ================================================================== --- src/OFStream+Private.h +++ src/OFStream+Private.h @@ -16,10 +16,10 @@ #import "OFStream.h" OF_ASSUME_NONNULL_BEGIN -@interface OFStream (OF_PRIVATE_CATEGORY) +@interface OFStream () @property (readonly) bool OF_isWaitingForDelimiter; @end OF_ASSUME_NONNULL_END Index: src/OFString.m ================================================================== --- src/OFString.m +++ src/OFString.m @@ -64,11 +64,11 @@ */ #ifdef __MINGW32__ # define strtod __strtod #endif -@interface OFString (OF_PRIVATE_CATEGORY) +@interface OFString () - (size_t)OF_getCString: (char*)cString maxLength: (size_t)maxLength encoding: (of_string_encoding_t)encoding lossy: (bool)lossy; - (const char*)OF_cStringWithEncoding: (of_string_encoding_t)encoding Index: src/OFString_UTF8+Private.h ================================================================== --- src/OFString_UTF8+Private.h +++ src/OFString_UTF8+Private.h @@ -16,12 +16,12 @@ #import "OFString_UTF8.h" OF_ASSUME_NONNULL_BEGIN -@interface OFString_UTF8 (OF_PRIVATE_CATEGORY) +@interface OFString_UTF8 () - (instancetype)OF_initWithUTF8String: (const char*)UTF8String length: (size_t)UTF8StringLength storage: (char*)storage; @end OF_ASSUME_NONNULL_END Index: src/OFThread+Private.h ================================================================== --- src/OFThread+Private.h +++ src/OFThread+Private.h @@ -17,11 +17,11 @@ #import "OFThread.h" OF_ASSUME_NONNULL_BEGIN #ifdef OF_HAVE_THREADS -@interface OFThread (OF_PRIVATE_CATEGORY) +@interface OFThread () + (void)OF_createMainThread; @end #endif OF_ASSUME_NONNULL_END Index: src/OFTimer+Private.h ================================================================== --- src/OFTimer+Private.h +++ src/OFTimer+Private.h @@ -16,11 +16,11 @@ #import "OFTimer.h" OF_ASSUME_NONNULL_BEGIN -@interface OFTimer (OF_PRIVATE_CATEGORY) +@interface OFTimer () @property OF_NULLABLE_PROPERTY (retain, setter=OF_setInRunLoop:) OFRunLoop *OF_inRunLoop; @end OF_ASSUME_NONNULL_END Index: src/OFZIPArchive.m ================================================================== --- src/OFZIPArchive.m +++ src/OFZIPArchive.m @@ -46,11 +46,11 @@ * - Write support is missing. * - The ZIP has to be a file on the local file system. * - Encrypted files cannot be read. */ -@interface OFZIPArchive (OF_PRIVATE_CATEGORY) +@interface OFZIPArchive () - (void)OF_readZIPInfo; - (void)OF_readEntries; @end @interface OFZIPArchive_LocalFileHeader: OFObject Index: src/OFZIPArchiveEntry+Private.h ================================================================== --- src/OFZIPArchiveEntry+Private.h +++ src/OFZIPArchiveEntry+Private.h @@ -16,14 +16,14 @@ #import "OFZIPArchive.h" OF_ASSUME_NONNULL_BEGIN -@interface OFZIPArchiveEntry (OF_PRIVATE_CATEGORY) +@interface OFZIPArchiveEntry () @property (readonly) uint16_t OF_generalPurposeBitFlag, OF_lastModifiedFileTime; @property (readonly) uint16_t OF_lastModifiedFileDate; @property (readonly) uint64_t OF_localFileHeaderOffset; - (instancetype)OF_initWithStream: (OFStream*)stream; @end OF_ASSUME_NONNULL_END