Revision: 4128
http://skim-app.svn.sourceforge.net/skim-app/?rev=4128&view=rev
Author: hofman
Date: 2008-07-04 04:06:17 -0700 (Fri, 04 Jul 2008)
Log Message:
-----------
Use leopard-style typedefs for enums.
Modified Paths:
--------------
trunk/SKLineWell.h
trunk/SKLineWell.m
trunk/SKMainWindowController.h
trunk/SKMainWindowController_UI.m
trunk/SKPDFView.h
trunk/SKPDFView.m
trunk/SKStatusBar.h
Modified: trunk/SKLineWell.h
===================================================================
--- trunk/SKLineWell.h 2008-07-03 17:31:14 UTC (rev 4127)
+++ trunk/SKLineWell.h 2008-07-04 11:06:17 UTC (rev 4128)
@@ -47,11 +47,12 @@
extern NSString *SKLineWellStartLineStyleKey;
extern NSString *SKLineWellEndLineStyleKey;
-typedef enum _SKLineWellDisplayStyle {
+enum {
SKLineWellDisplayStyleLine,
SKLineWellDisplayStyleRectangle,
SKLineWellDisplayStyleOval
-} SKLineWellDisplayStyle;
+};
+typedef NSInteger SKLineWellDisplayStyle;
@interface SKLineWell : NSControl {
float lineWidth;
Modified: trunk/SKLineWell.m
===================================================================
--- trunk/SKLineWell.m 2008-07-03 17:31:14 UTC (rev 4127)
+++ trunk/SKLineWell.m 2008-07-04 11:06:17 UTC (rev 4128)
@@ -124,11 +124,11 @@
target = [decoder decodeObjectForKey:SKLineWellTargetKey];
} else {
[decoder decodeValueOfObjCType:@encode(float) at:&lineWidth];
- [decoder decodeValueOfObjCType:@encode(int) at:&style];
+ [decoder decodeValueOfObjCType:@encode(NSInteger) at:&style];
dashPattern = [[decoder decodeObject] retain];
- [decoder decodeValueOfObjCType:@encode(int) at:&startLineStyle];
- [decoder decodeValueOfObjCType:@encode(int) at:&endLineStyle];
- [decoder decodeValueOfObjCType:@encode(int) at:&displayStyle];
+ [decoder decodeValueOfObjCType:@encode(NSInteger)
at:&startLineStyle];
+ [decoder decodeValueOfObjCType:@encode(NSInteger)
at:&endLineStyle];
+ [decoder decodeValueOfObjCType:@encode(NSInteger)
at:&displayStyle];
[decoder decodeValueOfObjCType:@encode(BOOL) at:&active];
[decoder decodeValueOfObjCType:@encode(SEL) at:&action];
target = [decoder decodeObject];
@@ -152,11 +152,11 @@
[coder encodeConditionalObject:target forKey:SKLineWellTargetKey];
} else {
[coder encodeValueOfObjCType:@encode(float) at:&lineWidth];
- [coder encodeValueOfObjCType:@encode(int) at:&style];
+ [coder encodeValueOfObjCType:@encode(NSInteger) at:&style];
[coder encodeObject:dashPattern];
- [coder encodeValueOfObjCType:@encode(int) at:&startLineStyle];
- [coder encodeValueOfObjCType:@encode(int) at:&endLineStyle];
- [coder encodeValueOfObjCType:@encode(int) at:&displayStyle];
+ [coder encodeValueOfObjCType:@encode(NSInteger) at:&startLineStyle];
+ [coder encodeValueOfObjCType:@encode(NSInteger) at:&endLineStyle];
+ [coder encodeValueOfObjCType:@encode(NSInteger) at:&displayStyle];
[coder encodeValueOfObjCType:@encode(BOOL) at:&active];
[coder encodeValueOfObjCType:@encode(SEL) at:action];
[coder encodeConditionalObject:target];
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2008-07-03 17:31:14 UTC (rev 4127)
+++ trunk/SKMainWindowController.h 2008-07-04 11:06:17 UTC (rev 4128)
@@ -38,20 +38,23 @@
#import <Cocoa/Cocoa.h>
-typedef enum _SKLeftSidePaneState {
+enum {
SKThumbnailSidePaneState,
SKOutlineSidePaneState
-} SKLeftSidePaneState;
+};
+typedef NSInteger SKLeftSidePaneState;
-typedef enum _SKRightSidePaneState {
+enum {
SKNoteSidePaneState,
SKSnapshotSidePaneState
-} SKRightSidePaneState;
+};
+typedef NSInteger SKRightSidePaneState;
-typedef enum _SKFindPaneState {
+enum {
SKSingularFindPaneState,
SKGroupedFindPaneState
-} SKFindPaneState;
+};
+typedef NSInteger SKFindPaneState;
enum {
SKDefaultWindowOption,
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2008-07-03 17:31:14 UTC (rev 4127)
+++ trunk/SKMainWindowController_UI.m 2008-07-04 11:06:17 UTC (rev 4128)
@@ -1095,16 +1095,16 @@
return [self isPresentation] == NO;
} else if (action == @selector(changeDisplaySinglePages:)) {
BOOL displaySinglePages1 = [pdfView displayMode] ==
kPDFDisplaySinglePage || [pdfView displayMode] ==
kPDFDisplaySinglePageContinuous;
- BOOL displaySinglePages2 = [menuItem tag] == kPDFDisplaySinglePage;
+ BOOL displaySinglePages2 = (PDFDisplayMode)[menuItem tag] ==
kPDFDisplaySinglePage;
[menuItem setState:displaySinglePages1 == displaySinglePages2 ?
NSOnState : NSOffState];
return [self isPresentation] == NO;
} else if (action == @selector(changeDisplayContinuous:)) {
BOOL displayContinuous1 = [pdfView displayMode] ==
kPDFDisplaySinglePageContinuous || [pdfView displayMode] ==
kPDFDisplayTwoUpContinuous;
- BOOL displayContinuous2 = [menuItem tag] ==
kPDFDisplaySinglePageContinuous;
+ BOOL displayContinuous2 = (PDFDisplayMode)[menuItem tag] ==
kPDFDisplaySinglePageContinuous;
[menuItem setState:displayContinuous1 == displayContinuous2 ?
NSOnState : NSOffState];
return [self isPresentation] == NO;
} else if (action == @selector(changeDisplayMode:)) {
- [menuItem setState:[pdfView displayMode] == [menuItem tag] ? NSOnState
: NSOffState];
+ [menuItem setState:[pdfView displayMode] == (PDFDisplayMode)[menuItem
tag] ? NSOnState : NSOffState];
return [self isPresentation] == NO;
} else if (action == @selector(toggleDisplayContinuous:)) {
BOOL displayContinuous = [pdfView displayMode] ==
kPDFDisplaySinglePageContinuous || [pdfView displayMode] ==
kPDFDisplayTwoUpContinuous;
@@ -1117,16 +1117,16 @@
[menuItem setState:[pdfView displaysPageBreaks] ? NSOnState :
NSOffState];
return [self isPresentation] == NO;
} else if (action == @selector(changeDisplayBox:)) {
- [menuItem setState:[pdfView displayBox] == [menuItem tag] ? NSOnState
: NSOffState];
+ [menuItem setState:[pdfView displayBox] == (PDFDisplayBox)[menuItem
tag] ? NSOnState : NSOffState];
return [self isPresentation] == NO;
} else if (action == @selector(changeToolMode:)) {
- [menuItem setState:[pdfView toolMode] == (unsigned)[menuItem tag] ?
NSOnState : NSOffState];
+ [menuItem setState:[pdfView toolMode] == (SKToolMode)[menuItem tag] ?
NSOnState : NSOffState];
return YES;
} else if (action == @selector(changeAnnotationMode:)) {
if ([[menuItem menu] numberOfItems] > 8)
- [menuItem setState:[pdfView toolMode] == SKNoteToolMode &&
[pdfView annotationMode] == (unsigned)[menuItem tag] ? NSOnState : NSOffState];
+ [menuItem setState:[pdfView toolMode] == SKNoteToolMode &&
[pdfView annotationMode] == (SKToolMode)[menuItem tag] ? NSOnState :
NSOffState];
else
- [menuItem setState:[pdfView annotationMode] == (unsigned)[menuItem
tag] ? NSOnState : NSOffState];
+ [menuItem setState:[pdfView annotationMode] ==
(SKToolMode)[menuItem tag] ? NSOnState : NSOffState];
return YES;
} else if (action == @selector(doGoToNextPage:)) {
return [pdfView canGoToNextPage];
@@ -1198,10 +1198,10 @@
[menuItem setTitle:NSLocalizedString(@"Show Notes Pane", @"Menu
item title")];
return [self isPresentation] == NO;
} else if (action == @selector(changeLeftSidePaneState:)) {
- [menuItem setState:(int)leftSidePaneState == [menuItem tag] ?
(([findTableView window] || [groupedFindTableView window]) ? NSMixedState :
NSOnState) : NSOffState];
- return [menuItem tag] == SKThumbnailSidePaneState || pdfOutline;
+ [menuItem setState:leftSidePaneState == (SKLeftSidePaneState)[menuItem
tag] ? (([findTableView window] || [groupedFindTableView window]) ?
NSMixedState : NSOnState) : NSOffState];
+ return (SKLeftSidePaneState)[menuItem tag] == SKThumbnailSidePaneState
|| pdfOutline;
} else if (action == @selector(changeRightSidePaneState:)) {
- [menuItem setState:(int)rightSidePaneState == [menuItem tag] ?
NSOnState : NSOffState];
+ [menuItem setState:rightSidePaneState ==
(SKRightSidePaneState)[menuItem tag] ? NSOnState : NSOffState];
return [self isPresentation] == NO;
} else if (action == @selector(toggleSplitPDF:)) {
if ([secondaryPdfView window])
Modified: trunk/SKPDFView.h
===================================================================
--- trunk/SKPDFView.h 2008-07-03 17:31:14 UTC (rev 4127)
+++ trunk/SKPDFView.h 2008-07-04 11:06:17 UTC (rev 4128)
@@ -62,15 +62,16 @@
extern NSString *SKSkimNotePboardType;
-typedef enum _SKToolMode {
+enum _SKToolMode {
SKTextToolMode,
SKMoveToolMode,
SKMagnifyToolMode,
SKSelectToolMode,
SKNoteToolMode
-} SKToolMode;
+};
+typedef NSInteger SKToolMode;
-typedef enum _SKNoteType {
+enum {
SKFreeTextNote,
SKAnchoredNote,
SKCircleNote,
@@ -79,13 +80,15 @@
SKUnderlineNote,
SKStrikeOutNote,
SKLineNote
-} SKNoteType;
+};
+typedef NSInteger SKNoteType;
-typedef enum _SKInteractionMode {
+enum {
SKNormalMode,
SKFullScreenMode,
SKPresentationMode
-} SKInteractionMode;
+};
+typedef NSInteger SKInteractionMode;
@class SKReadingBar, SKTransitionController, SKTypeSelectHelper;
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2008-07-03 17:31:14 UTC (rev 4127)
+++ trunk/SKPDFView.m 2008-07-04 11:06:17 UTC (rev 4128)
@@ -2338,13 +2338,13 @@
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
SEL action = [menuItem action];
if (action == @selector(changeToolMode:)) {
- [menuItem setState:[self toolMode] == (unsigned)[menuItem tag] ?
NSOnState : NSOffState];
+ [menuItem setState:[self toolMode] == (SKToolMode)[menuItem tag] ?
NSOnState : NSOffState];
return YES;
} else if (action == @selector(changeAnnotationMode:)) {
if ([[menuItem menu] numberOfItems] > 8)
- [menuItem setState:[self toolMode] == SKNoteToolMode && [self
annotationMode] == (unsigned)[menuItem tag] ? NSOnState : NSOffState];
+ [menuItem setState:[self toolMode] == SKNoteToolMode && [self
annotationMode] == (SKToolMode)[menuItem tag] ? NSOnState : NSOffState];
else
- [menuItem setState:[self annotationMode] == (unsigned)[menuItem
tag] ? NSOnState : NSOffState];
+ [menuItem setState:[self annotationMode] == (SKToolMode)[menuItem
tag] ? NSOnState : NSOffState];
return YES;
} else if (action == @selector(copy:)) {
if ([self currentSelection])
Modified: trunk/SKStatusBar.h
===================================================================
--- trunk/SKStatusBar.h 2008-07-03 17:31:14 UTC (rev 4127)
+++ trunk/SKStatusBar.h 2008-07-04 11:06:17 UTC (rev 4128)
@@ -38,11 +38,12 @@
#import <Cocoa/Cocoa.h>
-typedef enum {
+enum {
SKProgressIndicatorNone = -1,
SKProgressIndicatorBarStyle = NSProgressIndicatorBarStyle,
SKProgressIndicatorSpinningStyle = NSProgressIndicatorSpinningStyle
-} SKProgressIndicatorStyle;
+};
+typedef NSInteger SKProgressIndicatorStyle;
@interface SKStatusBar : NSControl {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
