Revision: 5761
http://skim-app.svn.sourceforge.net/skim-app/?rev=5761&view=rev
Author: hofman
Date: 2009-09-19 12:13:52 +0000 (Sat, 19 Sep 2009)
Log Message:
-----------
just declare our own delegate protocols in the delegate's type
Modified Paths:
--------------
trunk/BDSKDragImageView.h
trunk/BDSKDragImageView.m
trunk/SKCompatibility.h
trunk/SKDownload.h
trunk/SKDownload.m
trunk/SKPDFSynchronizer.h
trunk/SKPDFSynchronizer.m
trunk/SKSnapshotWindowController.h
trunk/SKSnapshotWindowController.m
trunk/SKThumbnail.h
trunk/SKThumbnail.m
Modified: trunk/BDSKDragImageView.h
===================================================================
--- trunk/BDSKDragImageView.h 2009-09-19 11:57:49 UTC (rev 5760)
+++ trunk/BDSKDragImageView.h 2009-09-19 12:13:52 UTC (rev 5761)
@@ -51,11 +51,11 @@
@interface BDSKDragImageView : NSImageView {
- id SKCONFORM(BDSKDragImageViewDelegate) delegate;
+ id <BDSKDragImageViewDelegate> delegate;
}
-- (id SKCONFORM(BDSKDragImageViewDelegate))delegate;
-- (void)setDelegate:(id SKCONFORM(BDSKDragImageViewDelegate))newDelegate;
+- (id <BDSKDragImageViewDelegate>)delegate;
+- (void)setDelegate:(id <BDSKDragImageViewDelegate>)newDelegate;
- (IBAction)show:(id)sender;
Modified: trunk/BDSKDragImageView.m
===================================================================
--- trunk/BDSKDragImageView.m 2009-09-19 11:57:49 UTC (rev 5760)
+++ trunk/BDSKDragImageView.m 2009-09-19 12:13:52 UTC (rev 5761)
@@ -40,11 +40,11 @@
@implementation BDSKDragImageView
-- (id SKCONFORM(BDSKDragImageViewDelegate))delegate {
+- (id <BDSKDragImageViewDelegate>)delegate {
return delegate;
}
-- (void)setDelegate:(id SKCONFORM(BDSKDragImageViewDelegate))newDelegate {
+- (void)setDelegate:(id <BDSKDragImageViewDelegate>)newDelegate {
delegate = newDelegate;
}
Modified: trunk/SKCompatibility.h
===================================================================
--- trunk/SKCompatibility.h 2009-09-19 11:57:49 UTC (rev 5760)
+++ trunk/SKCompatibility.h 2009-09-19 12:13:52 UTC (rev 5761)
@@ -57,12 +57,6 @@
@protocol NSTabViewDelegate <NSObject> @end
@protocol NSSplitViewDelegate <NSObject> @end
-#define SKCONFORM(protocol)
-
-#else
-
-#define SKCONFORM(protocol) <protocol>
-
#endif
#ifndef NSAppKitVersionNumber10_5
Modified: trunk/SKDownload.h
===================================================================
--- trunk/SKDownload.h 2009-09-19 11:57:49 UTC (rev 5760)
+++ trunk/SKDownload.h 2009-09-19 12:13:52 UTC (rev 5761)
@@ -76,13 +76,13 @@
NSImage *fileIcon;
NSProgressIndicator *progressIndicator;
NSInteger status;
- id SKCONFORM(SKDownloadDelegate) delegate;
+ <SKDownloadDelegate> delegate;
}
-- (id)initWithURL:(NSURL *)aURL delegate:(id
SKCONFORM(SKDownloadDelegate))aDelegate;
+- (id)initWithURL:(NSURL *)aURL delegate:(<SKDownloadDelegate>)aDelegate;
-- (id SKCONFORM(SKDownloadDelegate))delegate;
-- (void)setDelegate:(id SKCONFORM(SKDownloadDelegate))newDelegate;
+- (<SKDownloadDelegate>)delegate;
+- (void)setDelegate:(<SKDownloadDelegate>)newDelegate;
- (SKDownloadStatus)status;
Modified: trunk/SKDownload.m
===================================================================
--- trunk/SKDownload.m 2009-09-19 11:57:49 UTC (rev 5760)
+++ trunk/SKDownload.m 2009-09-19 12:13:52 UTC (rev 5761)
@@ -83,7 +83,7 @@
return [self infoKeys];
}
-- (id)initWithURL:(NSURL *)aURL delegate:(id
SKCONFORM(SKDownloadDelegate))aDelegate {
+- (id)initWithURL:(NSURL *)aURL delegate:(<SKDownloadDelegate>)aDelegate {
if (self = [super init]) {
URL = [aURL retain];
URLDownload = nil;
@@ -132,11 +132,11 @@
#pragma mark Accessors
-- (id SKCONFORM(SKDownloadDelegate))delegate {
+- (<SKDownloadDelegate>)delegate {
return delegate;
}
-- (void)setDelegate:(id SKCONFORM(SKDownloadDelegate))newDelegate {
+- (void)setDelegate:(<SKDownloadDelegate>)newDelegate {
delegate = newDelegate;
}
Modified: trunk/SKPDFSynchronizer.h
===================================================================
--- trunk/SKPDFSynchronizer.h 2009-09-19 11:57:49 UTC (rev 5760)
+++ trunk/SKPDFSynchronizer.h 2009-09-19 12:13:52 UTC (rev 5761)
@@ -56,15 +56,15 @@
@interface SKPDFSynchronizer : NSObject {
- id SKCONFORM(SKPDFSynchronizerDelegate) delegate;
+ id <SKPDFSynchronizerDelegate> delegate;
id server;
id serverProxy;
NSConnection *connection;
}
-- (id SKCONFORM(SKPDFSynchronizerDelegate))delegate;
-- (void)setDelegate:(id SKCONFORM(SKPDFSynchronizerDelegate))newDelegate;
+- (id <SKPDFSynchronizerDelegate>)delegate;
+- (void)setDelegate:(id <SKPDFSynchronizerDelegate>)newDelegate;
- (NSString *)fileName;
- (void)setFileName:(NSString *)newFileName;
Modified: trunk/SKPDFSynchronizer.m
===================================================================
--- trunk/SKPDFSynchronizer.m 2009-09-19 11:57:49 UTC (rev 5760)
+++ trunk/SKPDFSynchronizer.m 2009-09-19 12:13:52 UTC (rev 5761)
@@ -97,11 +97,11 @@
#pragma mark | Accessors
-- (id SKCONFORM(SKPDFSynchronizerDelegate))delegate {
+- (id <SKPDFSynchronizerDelegate>)delegate {
return delegate;
}
-- (void)setDelegate:(id SKCONFORM(SKPDFSynchronizerDelegate))newDelegate {
+- (void)setDelegate:(id <SKPDFSynchronizerDelegate>)newDelegate {
delegate = newDelegate;
}
Modified: trunk/SKSnapshotWindowController.h
===================================================================
--- trunk/SKSnapshotWindowController.h 2009-09-19 11:57:49 UTC (rev 5760)
+++ trunk/SKSnapshotWindowController.h 2009-09-19 12:13:52 UTC (rev 5761)
@@ -58,7 +58,7 @@
@interface SKSnapshotWindowController : NSWindowController <NSWindowDelegate> {
IBOutlet SKSnapshotPDFView* pdfView;
NSImage *thumbnail;
- id SKCONFORM(SKSnapshotWindowControllerDelegate) delegate;
+ id <SKSnapshotWindowControllerDelegate> delegate;
NSString *pageLabel;
BOOL hasWindow;
BOOL miniaturizing;
@@ -72,8 +72,8 @@
- (void)redisplay;
-- (id SKCONFORM(SKSnapshotWindowControllerDelegate))delegate;
-- (void)setDelegate:(id
SKCONFORM(SKSnapshotWindowControllerDelegate))newDelegate;
+- (id <SKSnapshotWindowControllerDelegate>)delegate;
+- (void)setDelegate:(id <SKSnapshotWindowControllerDelegate>)newDelegate;
- (PDFView *)pdfView;
- (NSImage *)thumbnail;
Modified: trunk/SKSnapshotWindowController.m
===================================================================
--- trunk/SKSnapshotWindowController.m 2009-09-19 11:57:49 UTC (rev 5760)
+++ trunk/SKSnapshotWindowController.m 2009-09-19 12:13:52 UTC (rev 5761)
@@ -269,11 +269,11 @@
#pragma mark Acessors
-- (id SKCONFORM(SKSnapshotWindowControllerDelegate))delegate {
+- (<SKSnapshotWindowControllerDelegate>)delegate {
return delegate;
}
-- (void)setDelegate:(id
SKCONFORM(SKSnapshotWindowControllerDelegate))newDelegate {
+- (void)setDelegate:(<SKSnapshotWindowControllerDelegate>)newDelegate {
delegate = newDelegate;
}
Modified: trunk/SKThumbnail.h
===================================================================
--- trunk/SKThumbnail.h 2009-09-19 11:57:49 UTC (rev 5760)
+++ trunk/SKThumbnail.h 2009-09-19 12:13:52 UTC (rev 5761)
@@ -52,13 +52,13 @@
NSString *label;
NSUInteger pageIndex;
BOOL dirty;
- id SKCONFORM(SKThumbnailDelegate) delegate;
+ <SKThumbnailDelegate> delegate;
}
- (id)initWithImage:(NSImage *)anImage label:(NSString *)aLabel
pageIndex:(NSUInteger)anIndex;
-- (id SKCONFORM(SKThumbnailDelegate))delegate;
-- (void)setDelegate:(id SKCONFORM(SKThumbnailDelegate))newDelegate;
+- (<SKThumbnailDelegate>)delegate;
+- (void)setDelegate:(<SKThumbnailDelegate>)newDelegate;
- (BOOL)isDirty;
- (void)setDirty:(BOOL)flag;
Modified: trunk/SKThumbnail.m
===================================================================
--- trunk/SKThumbnail.m 2009-09-19 11:57:49 UTC (rev 5760)
+++ trunk/SKThumbnail.m 2009-09-19 12:13:52 UTC (rev 5761)
@@ -57,9 +57,9 @@
[super dealloc];
}
-- (id SKCONFORM(SKThumbnailDelegate))delegate { return delegate; }
+- (<SKThumbnailDelegate>)delegate { return delegate; }
-- (void)setDelegate:(id SKCONFORM(SKThumbnailDelegate))newDelegate { delegate
= newDelegate; }
+- (void)setDelegate:(<SKThumbnailDelegate>)newDelegate { delegate =
newDelegate; }
- (BOOL)isDirty { return dirty; }
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit