gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-06-04 02:20:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

NSMetadataQueryDelegate uses new GS_PROTOCOLS_HAVE_OPTIONAL macro now (and

Browse source 
minor tweaks)


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@37528 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
znek 2013-12-31 13:14:11 +00:00
parent 2011f25eff
commit 006bb252a0
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2013-12-31 Marcus Mueller <znek@mulle-kybernetik.com>
* Headers/Foundation/NSMetadata.h: use GS_PROTOCOLS_HAVE_OPTIONAL for
NSMetadataQueryDelegate. Always define the protocol, even if it's empty
(so we don't have to adjust any headers), but fallback to the informal
protocol if OS version < 10.6 OR compiler doesn't support @optional
keyword in protocols.
2013-12-30 Marcus Mueller <znek@mulle-kybernetik.com> 2013-12-30 Marcus Mueller <znek@mulle-kybernetik.com>
* Headers/GNUstepBase/GSVersionMacros.h: added macros * Headers/GNUstepBase/GSVersionMacros.h: added macros

8
Headers/Foundation/NSMetadata.h
View file

@ -26,6 +26,7 @@
#ifndef __NSMetadata_h_GNUSTEP_BASE_INCLUDE #ifndef __NSMetadata_h_GNUSTEP_BASE_INCLUDE
#define __NSMetadata_h_GNUSTEP_BASE_INCLUDE #define __NSMetadata_h_GNUSTEP_BASE_INCLUDE
#import <GNUstepBase/GSVersionMacros.h>
#import <Foundation/NSObject.h> #import <Foundation/NSObject.h>
#import <Foundation/NSTimer.h> #import <Foundation/NSTimer.h>
@ -129,9 +130,12 @@ GS_EXPORT NSString * const NSMetadataQueryGatheringProgressNotification;
@end @end
@protocol NSMetadataQueryDelegate @protocol NSMetadataQueryDelegate
#ifdef __OBJC2__ #if OS_API_VERSION(MAC_OS_X_VERSION_10_6,GS_API_LATEST) && GS_PROTOCOLS_HAVE_OPTIONAL
@optional @optional
#endif #else
@end
@interface NSObject (NSMetadataQueryDelegate)
#endif // GS_PROTOCOLS_HAVE_OPTIONAL
- (id) metadataQuery: (NSMetadataQuery *)query - (id) metadataQuery: (NSMetadataQuery *)query
replacementObjectForResultObject: (NSMetadataItem *)result; replacementObjectForResultObject: (NSMetadataItem *)result;
- (id) metadataQuery: (NSMetadataQuery *)query - (id) metadataQuery: (NSMetadataQuery *)query