diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-04-07 03:04:31 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-04-07 03:04:31 +0300 |
| commit | 07c9bb103823dd9c0dc297d0315907ab94488f93 (patch) | |
| tree | 53b894b927c37c8a6e8779225861861656b033ac /extensions/source/macosx | |
| parent | d0d2c12a54e590496af9d0df278c863365293ae0 (diff) | |
Drop workarounds for Mac OS X SDKs 10.4 and 10.5
Change-Id: Ifa07f9b5613b4a75c5b72178cb276b9c0b495a62
Diffstat (limited to 'extensions/source/macosx')
5 files changed, 1 insertions, 29 deletions
diff --git a/extensions/source/macosx/spotlight/GetMetadataForFile.m b/extensions/source/macosx/spotlight/GetMetadataForFile.m index 9026e085f6b9..82f897745c85 100644 --- a/extensions/source/macosx/spotlight/GetMetadataForFile.m +++ b/extensions/source/macosx/spotlight/GetMetadataForFile.m @@ -17,21 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#import <Foundation/NSObjCRuntime.h> -#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050 -@class CALayer; -@class NSViewController; -typedef int NSColorRenderingIntent; -#endif - #include <CoreFoundation/CoreFoundation.h> #include <CoreServices/CoreServices.h> #include <Foundation/Foundation.h> - #import "OOoSpotlightImporter.h" - /* ----------------------------------------------------------------------------- Get metadata attributes from file diff --git a/extensions/source/macosx/spotlight/OOoContentDataParser.h b/extensions/source/macosx/spotlight/OOoContentDataParser.h index f642651e9bff..7112497cf7de 100644 --- a/extensions/source/macosx/spotlight/OOoContentDataParser.h +++ b/extensions/source/macosx/spotlight/OOoContentDataParser.h @@ -19,7 +19,6 @@ #import <Cocoa/Cocoa.h> - @interface OOoContentDataParser : NSObject { // indicates if we are interested in an element's content BOOL shouldReadCharacters; diff --git a/extensions/source/macosx/spotlight/OOoContentDataParser.m b/extensions/source/macosx/spotlight/OOoContentDataParser.m index b711e422cd38..8c8d81f89d03 100644 --- a/extensions/source/macosx/spotlight/OOoContentDataParser.m +++ b/extensions/source/macosx/spotlight/OOoContentDataParser.m @@ -18,12 +18,6 @@ */ #include <objc/objc-runtime.h> -#import <Foundation/NSObjCRuntime.h> -#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050 -@class CALayer; -@class NSViewController; -typedef int NSColorRenderingIntent; -#endif #import "OOoContentDataParser.h" diff --git a/extensions/source/macosx/spotlight/OOoMetaDataParser.m b/extensions/source/macosx/spotlight/OOoMetaDataParser.m index bc9529dfeb3a..a6ce40ac1368 100644 --- a/extensions/source/macosx/spotlight/OOoMetaDataParser.m +++ b/extensions/source/macosx/spotlight/OOoMetaDataParser.m @@ -18,12 +18,6 @@ */ #include <objc/objc-runtime.h> -#import <Foundation/NSObjCRuntime.h> -#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050 -@class CALayer; -@class NSViewController; -typedef int NSColorRenderingIntent; -#endif #import "OOoMetaDataParser.h" diff --git a/extensions/source/macosx/spotlight/OOoSpotlightImporter.m b/extensions/source/macosx/spotlight/OOoSpotlightImporter.m index 15cafe5b8406..6302e95c7380 100644 --- a/extensions/source/macosx/spotlight/OOoSpotlightImporter.m +++ b/extensions/source/macosx/spotlight/OOoSpotlightImporter.m @@ -17,14 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#import <Foundation/NSObjCRuntime.h> -#if defined (NSFoundationVersionNumber10_5) && MAC_OS_X_VERSION_MAX_ALLOWED < 1050 -@class CALayer; -@class NSViewController; -typedef int NSColorRenderingIntent; -#endif - #import <zlib.h> + #import "OOoSpotlightImporter.h" #import "OOoMetaDataParser.h" #import "OOoContentDataParser.h" |