Revision: 4341
http://skim-app.svn.sourceforge.net/skim-app/?rev=4341&view=rev
Author: hofman
Date: 2008-08-03 10:24:56 +0000 (Sun, 03 Aug 2008)
Log Message:
-----------
Custom callback names in line with standard ones
Modified Paths:
--------------
trunk/PDFAnnotationMarkup_SKExtensions.m
trunk/PDFPage_SKExtensions.m
trunk/SKCFCallBacks.h
trunk/SKCFCallBacks.m
trunk/SKMainWindowController.m
trunk/SKPDFSynchronizer.m
Modified: trunk/PDFAnnotationMarkup_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationMarkup_SKExtensions.m 2008-08-03 10:17:53 UTC (rev
4340)
+++ trunk/PDFAnnotationMarkup_SKExtensions.m 2008-08-03 10:24:56 UTC (rev
4341)
@@ -45,7 +45,7 @@
#import "PDFSelection_SKExtensions.h"
#import "NSUserDefaults_SKExtensions.h"
#import "NSGeometry_SKExtensions.h"
-#import "SKCFCallbacks.h"
+#import "SKCFCallBacks.h"
#import "NSObject_SKExtensions.h"
@@ -132,7 +132,7 @@
- (CFMutableArrayRef)lineRects {
CFMutableArrayRef lineRects =
(CFMutableArrayRef)CFDictionaryGetValue(lineRectsDict, self);
if (lineRects == NULL) {
- lineRects = CFArrayCreateMutable(NULL, 0, &SKNSRectArrayCallbacks);
+ lineRects = CFArrayCreateMutable(NULL, 0, &kSKNSRectArrayCallBacks);
CFDictionaryAddValue(lineRectsDict, self, lineRects);
CFRelease(lineRects);
}
Modified: trunk/PDFPage_SKExtensions.m
===================================================================
--- trunk/PDFPage_SKExtensions.m 2008-08-03 10:17:53 UTC (rev 4340)
+++ trunk/PDFPage_SKExtensions.m 2008-08-03 10:24:56 UTC (rev 4341)
@@ -75,7 +75,7 @@
+ (void)load {
originalDealloc = (void (*)(id, SEL))[self
setInstanceMethodFromSelector:@selector(replacementDealloc)
forSelector:@selector(dealloc)];
- bboxCache = CFDictionaryCreateMutable(NULL, 0, NULL,
&SKNSRectDictionaryValueCallbacks);
+ bboxCache = CFDictionaryCreateMutable(NULL, 0, NULL,
&kSKNSRectDictionaryValueCallBacks);
}
// mainly useful for drawing the box in a PDFView while debugging
Modified: trunk/SKCFCallBacks.h
===================================================================
--- trunk/SKCFCallBacks.h 2008-08-03 10:17:53 UTC (rev 4340)
+++ trunk/SKCFCallBacks.h 2008-08-03 10:24:56 UTC (rev 4341)
@@ -68,18 +68,18 @@
extern Boolean SKNSRectEqual(const void *value1, const void *value2);
-extern const CFDictionaryKeyCallBacks
SKPointerEqualObjectDictionaryKeyCallbacks;
+extern const CFDictionaryKeyCallBacks
kSKPointerEqualObjectDictionaryKeyCallBacks;
-extern const CFDictionaryKeyCallBacks SKCaseInsensitiveDictionaryKeyCallbacks;
+extern const CFDictionaryKeyCallBacks
kSKCaseInsensitiveStringDictionaryKeyCallBacks;
-extern const CFDictionaryValueCallBacks SKFloatDictionaryValueCallbacks;
+extern const CFDictionaryValueCallBacks kSKFloatDictionaryValueCallBacks;
-extern const CFDictionaryValueCallBacks SKFloatDictionaryValueCallbacks;
+extern const CFDictionaryValueCallBacks kSKFloatDictionaryValueCallBacks;
-extern const CFDictionaryValueCallBacks SKNSRectDictionaryValueCallbacks;
+extern const CFDictionaryValueCallBacks kSKNSRectDictionaryValueCallBacks;
-extern const CFArrayCallBacks SKNSRectArrayCallbacks;
+extern const CFArrayCallBacks kSKNSRectArrayCallBacks;
-extern const CFSetCallBacks SKPointerEqualObjectSetCallbacks;
+extern const CFSetCallBacks kSKPointerEqualObjectSetCallBacks;
Modified: trunk/SKCFCallBacks.m
===================================================================
--- trunk/SKCFCallBacks.m 2008-08-03 10:17:53 UTC (rev 4340)
+++ trunk/SKCFCallBacks.m 2008-08-03 10:24:56 UTC (rev 4341)
@@ -179,7 +179,7 @@
return NSEqualRects(*(NSRect *)value1, *(NSRect *)value2);
}
-const CFDictionaryKeyCallBacks SKPointerEqualObjectDictionaryKeyCallbacks = {
+const CFDictionaryKeyCallBacks kSKPointerEqualObjectDictionaryKeyCallBacks = {
0, // version
SKNSObjectRetain,
SKNSObjectRelease,
@@ -188,7 +188,7 @@
NULL // hash
};
-const CFDictionaryKeyCallBacks SKCaseInsensitiveDictionaryKeyCallbacks = {
+const CFDictionaryKeyCallBacks kSKCaseInsensitiveStringDictionaryKeyCallBacks
= {
0, // version
SKNSObjectRetain,
SKNSObjectRelease,
@@ -197,7 +197,7 @@
SKCaseInsensitiveStringHash
};
-const CFDictionaryValueCallBacks SKFloatDictionaryValueCallbacks = {
+const CFDictionaryValueCallBacks kSKFloatDictionaryValueCallBacks = {
0, // version
SKFloatRetain,
SKFloatRelease,
@@ -205,7 +205,7 @@
SKFloatEqual
};
-const CFDictionaryValueCallBacks SKNSRectDictionaryValueCallbacks = {
+const CFDictionaryValueCallBacks kSKNSRectDictionaryValueCallBacks = {
0, // version
SKNSRectRetain,
SKNSRectRelease,
@@ -213,7 +213,7 @@
SKNSRectEqual
};
-const CFArrayCallBacks SKNSRectArrayCallbacks = {
+const CFArrayCallBacks kSKNSRectArrayCallBacks = {
0, // version
SKNSRectRetain,
SKNSRectRelease,
@@ -221,7 +221,7 @@
SKNSRectEqual
};
-const CFSetCallBacks SKPointerEqualObjectSetCallbacks = {
+const CFSetCallBacks kSKPointerEqualObjectSetCallBacks = {
0, // version
SKNSObjectRetain,
SKNSObjectRelease,
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2008-08-03 10:17:53 UTC (rev 4340)
+++ trunk/SKMainWindowController.m 2008-08-03 10:24:56 UTC (rev 4341)
@@ -90,7 +90,7 @@
#import "SKColorSwatch.h"
#import "NSObject_SKExtensions.h"
#import "SKApplicationController.h"
-#import "SKCFCallbacks.h"
+#import "SKCFCallBacks.h"
#import "NSSegmentedControl_SKExtensions.h"
#import "NSImage_SKExtensions.h"
#import "SKGroupedSearchResult.h"
@@ -236,7 +236,7 @@
lastViewedPages = [[NSMutableArray alloc] init];
// @@ remove or set to nil for Leopard?
pdfOutlineItems = [[NSMutableArray alloc] init];
- rowHeights = CFDictionaryCreateMutable(NULL, 0,
&SKPointerEqualObjectDictionaryKeyCallbacks, &SKFloatDictionaryValueCallbacks);
+ rowHeights = CFDictionaryCreateMutable(NULL, 0,
&kSKPointerEqualObjectDictionaryKeyCallBacks,
&kSKFloatDictionaryValueCallBacks);
savedNormalSetup = [[NSMutableDictionary alloc] init];
leftSidePaneState = SKThumbnailSidePaneState;
rightSidePaneState = SKNoteSidePaneState;
@@ -1039,8 +1039,8 @@
}
- (void)setNotes:(NSArray *)newNotes {
- NSMutableSet *old = (NSMutableSet *)CFSetCreateMutable(NULL, 0,
&SKPointerEqualObjectSetCallbacks);
- NSMutableSet *new = (NSMutableSet *)CFSetCreateMutable(NULL, 0,
&SKPointerEqualObjectSetCallbacks);
+ NSMutableSet *old = (NSMutableSet *)CFSetCreateMutable(NULL, 0,
&kSKPointerEqualObjectSetCallBacks);
+ NSMutableSet *new = (NSMutableSet *)CFSetCreateMutable(NULL, 0,
&kSKPointerEqualObjectSetCallBacks);
NSMutableSet *removed;
NSMutableSet *added;
@@ -1163,8 +1163,8 @@
}
- (void)setSnapshots:(NSArray *)newSnapshots {
- NSMutableSet *removed = (NSMutableSet *)CFSetCreateMutable(NULL, 0,
&SKPointerEqualObjectSetCallbacks);
- NSMutableSet *new = (NSMutableSet *)CFSetCreateMutable(NULL, 0,
&SKPointerEqualObjectSetCallbacks);
+ NSMutableSet *removed = (NSMutableSet *)CFSetCreateMutable(NULL, 0,
&kSKPointerEqualObjectSetCallBacks);
+ NSMutableSet *new = (NSMutableSet *)CFSetCreateMutable(NULL, 0,
&kSKPointerEqualObjectSetCallBacks);
[new addObjectsFromArray:newSnapshots];
[removed addObjectsFromArray:snapshots];
@@ -3452,7 +3452,7 @@
NSUndoManager *undoManager = [[self document] undoManager];
if (undoGroupOldPropertiesPerNote == nil) {
// We haven't recorded changes for any notes at all since the
last undo manager checkpoint. Get ready to start collecting them. We don't want
to copy the PDFAnnotations though.
- undoGroupOldPropertiesPerNote = (NSMutableDictionary
*)CFDictionaryCreateMutable(NULL, 0,
&SKPointerEqualObjectDictionaryKeyCallbacks, &kCFTypeDictionaryValueCallBacks);
+ undoGroupOldPropertiesPerNote = (NSMutableDictionary
*)CFDictionaryCreateMutable(NULL, 0,
&kSKPointerEqualObjectDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
// Register an undo operation for any note property changes
that are going to be coalesced between now and the next invocation of
-observeUndoManagerCheckpoint:.
[undoManager registerUndoWithTarget:self
selector:@selector(setNoteProperties:) object:undoGroupOldPropertiesPerNote];
}
Modified: trunk/SKPDFSynchronizer.m
===================================================================
--- trunk/SKPDFSynchronizer.m 2008-08-03 10:17:53 UTC (rev 4340)
+++ trunk/SKPDFSynchronizer.m 2008-08-03 10:24:56 UTC (rev 4341)
@@ -100,9 +100,9 @@
isPdfsync = YES;
pages = [[NSMutableArray alloc] init];
- lines = (NSMutableDictionary
*)CFDictionaryCreateMutable(kCFAllocatorDefault, 0,
&SKCaseInsensitiveDictionaryKeyCallbacks, &kCFTypeDictionaryValueCallBacks);
+ lines = (NSMutableDictionary
*)CFDictionaryCreateMutable(kCFAllocatorDefault, 0,
&kSKCaseInsensitiveStringDictionaryKeyCallBacks,
&kCFTypeDictionaryValueCallBacks);
- filenames = (NSMutableDictionary
*)CFDictionaryCreateMutable(kCFAllocatorDefault, 0,
&SKCaseInsensitiveDictionaryKeyCallbacks, &kCFTypeDictionaryValueCallBacks);
+ filenames = (NSMutableDictionary
*)CFDictionaryCreateMutable(kCFAllocatorDefault, 0,
&kSKCaseInsensitiveStringDictionaryKeyCallBacks,
&kCFTypeDictionaryValueCallBacks);
scanner = NULL;
NSPort *port1 = [NSPort port];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
