Adjust to ObjFW changes

This commit is contained in:
Jonathan Schleifer 2017-05-13 16:49:49 +02:00
parent 73d3bca240
commit 5fa8b0b9b3
No known key found for this signature in database
GPG key ID: 28D65178B37F33E3
51 changed files with 935 additions and 859 deletions

View file

@ -23,6 +23,8 @@
#import <ObjFW/ObjFW.h>
OF_ASSUME_NONNULL_BEGIN
/**
* \brief A class describing a Service Discovery Identity
*/
@ -32,11 +34,11 @@
}
/// \brief The category of the identity
@property (readonly) OFString *category;
@property (readonly, nonatomic) OFString *category;
/// \brief The name of the identity, might be unset
@property (readonly) OFString *name;
@property (readonly, nonatomic) OFString *name;
/// \brief The type of the identity
@property (readonly) OFString *type;
@property (readonly, nonatomic) OFString *type;
/**
* \brief Creates a new autoreleased XMPPDiscoIdentity with the specified
@ -47,9 +49,9 @@
* \param name The name of the identity
* \return A new autoreleased XMPPDiscoIdentity
*/
+ (instancetype)identityWithCategory: (OFString*)category
type: (OFString*)type
name: (OFString*)name;
+ (instancetype)identityWithCategory: (OFString *)category
type: (OFString *)type
name: (nullable OFString *)name;
/**
* \brief Creates a new autoreleased XMPPDiscoIdentity with the specified
@ -59,8 +61,10 @@
* \param type The type of the identity
* \return A new autoreleased XMPPDiscoIdentity
*/
+ (instancetype)identityWithCategory: (OFString*)category
type: (OFString*)type;
+ (instancetype)identityWithCategory: (OFString *)category
type: (OFString *)type;
- init OF_UNAVAILABLE;
/**
* \brief Initializes an already allocated XMPPDiscoIdentity with the specified
@ -71,9 +75,9 @@
* \param name The name of the identity
* \return An initialized XMPPDiscoIdentity
*/
- initWithCategory: (OFString*)category
type: (OFString*)type
name: (OFString*)name;
- initWithCategory: (OFString *)category
type: (OFString *)type
name: (nullable OFString *)name OF_DESIGNATED_INITIALIZER;
/**
* \brief Initializes an already allocated XMPPDiscoIdentity with the specified
@ -83,6 +87,8 @@
* \param type The type of the identity
* \return An initialized XMPPDiscoIdentity
*/
- initWithCategory: (OFString*)category
type: (OFString*)type;
- initWithCategory: (OFString *)category
type: (OFString *)type;
@end
OF_ASSUME_NONNULL_END