DELETED src/OFData+Private.h Index: src/OFData+Private.h ================================================================== --- src/OFData+Private.h +++ src/OFData+Private.h @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, - * 2018 - * Jonathan Schleifer - * - * All rights reserved. - * - * This file is part of ObjFW. It may be distributed under the terms of the - * Q Public License 1.0, which can be found in the file LICENSE.QPL included in - * the packaging of this file. - * - * Alternatively, it may be distributed under the terms of the GNU General - * Public License, either version 2 or 3, which can be found in the file - * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this - * file. - */ - -#import "OFData.h" - -OF_ASSUME_NONNULL_BEGIN - -@interface OFData () -- (instancetype)of_init OF_METHOD_FAMILY(init); -@end - -OF_ASSUME_NONNULL_END Index: src/OFData.h ================================================================== --- src/OFData.h +++ src/OFData.h @@ -175,12 +175,10 @@ * @param string The string with the Base64-encoded data * @return A new autoreleased OFData */ + (instancetype)dataWithBase64EncodedString: (OFString *)string; -- (instancetype)init OF_UNAVAILABLE; - /*! * @brief Initialized an already allocated OFData with the specified `count` * items of size 1. * * @param items The items to store in the OFData Index: src/OFData.m ================================================================== --- src/OFData.m +++ src/OFData.m @@ -20,11 +20,10 @@ #include #include #include #import "OFData.h" -#import "OFData+Private.h" #import "OFDictionary.h" #ifdef OF_HAVE_FILES # import "OFFile.h" # import "OFFileManager.h" #endif @@ -113,20 +112,10 @@ + (instancetype)dataWithBase64EncodedString: (OFString *)string { return [[[self alloc] initWithBase64EncodedString: string] autorelease]; } -- (instancetype)init -{ - OF_INVALID_INIT_METHOD -} - -- (instancetype)of_init -{ - return [super init]; -} - - (instancetype)initWithItems: (const void *)items count: (size_t)count { return [self initWithItems: items itemSize: 1 Index: src/OFMutableData.m ================================================================== --- src/OFMutableData.m +++ src/OFMutableData.m @@ -20,11 +20,10 @@ #include #include #include #import "OFMutableData.h" -#import "OFData+Private.h" #import "OFString.h" #import "OFInvalidArgumentException.h" #import "OFOutOfMemoryException.h" #import "OFOutOfRangeException.h" @@ -52,20 +51,20 @@ capacity: capacity] autorelease]; } - (instancetype)init { - self = [super of_init]; + self = [super init]; _itemSize = 1; return self; } - (instancetype)initWithItemSize: (size_t)itemSize { - self = [super of_init]; + self = [super init]; @try { if (itemSize == 0) @throw [OFInvalidArgumentException exception]; @@ -85,11 +84,11 @@ } - (instancetype)initWithItemSize: (size_t)itemSize capacity: (size_t)capacity { - self = [super of_init]; + self = [super init]; @try { if (itemSize == 0) @throw [OFInvalidArgumentException exception]; Index: src/OFMutableURL.h ================================================================== --- src/OFMutableURL.h +++ src/OFMutableURL.h @@ -141,19 +141,12 @@ * * @return A new, autoreleased OFMutableURL */ + (instancetype)URL; -/*! - * @brief Initializes an already allocated OFMutableURL. - * - * @return An initialized OFMutableURL - */ -- (instancetype)init; - /*! * @brief Converts the mutable URL to an immutable URL. */ - (void)makeImmutable; @end OF_ASSUME_NONNULL_END Index: src/OFMutableURL.m ================================================================== --- src/OFMutableURL.m +++ src/OFMutableURL.m @@ -19,11 +19,10 @@ #import "OFMutableURL.h" #import "OFArray.h" #import "OFNumber.h" #import "OFString.h" -#import "OFURL+Private.h" #import "OFInvalidFormatException.h" extern void of_url_verify_escaped(OFString *, OFCharacterSet *); @@ -35,15 +34,10 @@ + (instancetype)URL { return [[[self alloc] init] autorelease]; } -- (instancetype)init -{ - return [super of_init]; -} - - (void)setScheme: (OFString *)scheme { void *pool = objc_autoreleasePoolPush(); OFString *old = _URLEncodedScheme; DELETED src/OFURL+Private.h Index: src/OFURL+Private.h ================================================================== --- src/OFURL+Private.h +++ src/OFURL+Private.h @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, - * 2018 - * Jonathan Schleifer - * - * All rights reserved. - * - * This file is part of ObjFW. It may be distributed under the terms of the - * Q Public License 1.0, which can be found in the file LICENSE.QPL included in - * the packaging of this file. - * - * Alternatively, it may be distributed under the terms of the GNU General - * Public License, either version 2 or 3, which can be found in the file - * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this - * file. - */ - -#import "OFURL.h" - -OF_ASSUME_NONNULL_BEGIN - -@interface OFURL () -- (instancetype)of_init OF_METHOD_FAMILY(init); -@end - -OF_ASSUME_NONNULL_END Index: src/OFURL.h ================================================================== --- src/OFURL.h +++ src/OFURL.h @@ -193,12 +193,10 @@ */ + (instancetype)fileURLWithPath: (OFString *)path isDirectory: (bool)isDirectory; #endif -- (instancetype)init OF_UNAVAILABLE; - /*! * @brief Initializes an already allocated OFURL with the specified string. * * @param string A string describing a URL * @return An initialized OFURL Index: src/OFURL.m ================================================================== --- src/OFURL.m +++ src/OFURL.m @@ -19,11 +19,10 @@ #include #include #import "OFURL.h" -#import "OFURL+Private.h" #import "OFArray.h" #import "OFNumber.h" #import "OFString.h" #import "OFXMLElement.h" @@ -383,20 +382,10 @@ return [[[self alloc] initFileURLWithPath: path isDirectory: isDirectory] autorelease]; } #endif -- (instancetype)init -{ - OF_INVALID_INIT_METHOD -} - -- (instancetype)of_init -{ - return [super init]; -} - - (instancetype)initWithString: (OFString *)string { char *UTF8String, *UTF8String2 = NULL; self = [super init];