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

@ -26,6 +26,8 @@
#import "XMPPConnection.h"
#import "XMPPRoster.h"
OF_ASSUME_NONNULL_BEGIN
@class XMPPContact;
@class XMPPContactManager;
@class XMPPMulticastDelegate;
@ -43,8 +45,8 @@
* \param manager The contact manager that added the contact
* \param contact The contact that was added
*/
- (void)contactManager: (XMPPContactManager*)manager
didAddContact: (XMPPContact*)contact;
- (void)contactManager: (XMPPContactManager *)manager
didAddContact: (XMPPContact *)contact;
/**
* \brief This callback is called whenever a contact is no longer present in
@ -53,8 +55,8 @@
* \param manager The contact manager that removed the contact
* \param contact The contact that was removed
*/
- (void)contactManager: (XMPPContactManager*)manager
didRemoveContact: (XMPPContact*)contact;
- (void)contactManager: (XMPPContactManager *)manager
didRemoveContact: (XMPPContact *)contact;
/**
* \brief This callback is called when a subscription request is received
@ -62,8 +64,8 @@
* \param manager The contact manager that received the request
* \param presence The type=subscribe presence
*/
- (void)contactManager: (XMPPContactManager*)manager
didReceiveSubscriptionRequest: (XMPPPresence*)presence;
- (void)contactManager: (XMPPContactManager *)manager
didReceiveSubscriptionRequest: (XMPPPresence *)presence;
/**
* \brief This callback is called whenever a contact is about to change its
@ -72,8 +74,8 @@
* \param contact The contact about to updated its roster item
* \param rosterItem The roster item the contact is going to update with
*/
- (void)contact: (XMPPContact*)contact
willUpdateWithRosterItem: (XMPPRosterItem*)rosterItem;
- (void)contact: (XMPPContact *)contact
willUpdateWithRosterItem: (XMPPRosterItem *)rosterItem;
/**
* \brief This callback is called whenever a contact send a presence stanza
@ -81,8 +83,8 @@
* \param contact The contact that send the presence
* \param presence The presence which was send by the contact
*/
- (void)contact: (XMPPContact*)contact
didSendPresence: (XMPPPresence*)presence;
- (void)contact: (XMPPContact *)contact
didSendPresence: (XMPPPresence *)presence;
/**
* \brief This callback is called whenever a contact send a message stanza
@ -90,8 +92,8 @@
* \param contact The contact that send the message
* \param message The message which was send by the contact
*/
- (void)contact: (XMPPContact*)contact
didSendMessage: (XMPPMessage*)message;
- (void)contact: (XMPPContact *)contact
didSendMessage: (XMPPMessage *)message;
@end
/**
@ -110,7 +112,8 @@
}
/// \brief The tracked contacts, with their bare JID as key
@property (readonly) OFDictionary *contacts;
@property (readonly, nonatomic)
OFDictionary OF_GENERIC(OFString *, XMPPContact *) *contacts;
/*!
* @brief Initializes an already allocated XMPPContactManager.
@ -119,11 +122,11 @@
* @param roster The roster used by the contact manager
* @return An initialized XMPPContactManager
*/
- initWithConnection: (XMPPConnection*)connection
roster: (XMPPRoster*)roster;
- initWithConnection: (XMPPConnection *)connection
roster: (XMPPRoster *)roster OF_DESIGNATED_INITIALIZER;
- (void)sendSubscribedToJID: (XMPPJID*)subscriber;
- (void)sendUnsubscribedToJID: (XMPPJID*)subscriber;
- (void)sendSubscribedToJID: (XMPPJID *)subscriber;
- (void)sendUnsubscribedToJID: (XMPPJID *)subscriber;
/**
* \brief Adds the specified delegate.
@ -139,3 +142,5 @@
*/
- (void)removeDelegate: (id <XMPPContactManagerDelegate>)delegate;
@end
OF_ASSUME_NONNULL_END