Revision: 28650
http://sourceforge.net/p/bibdesk/svn/28650
Author: hofman
Date: 2024-01-22 16:39:32 +0000 (Mon, 22 Jan 2024)
Log Message:
-----------
use NS_ENUM
Modified Paths:
--------------
trunk/bibdesk_vendorsrc/amaxwell/FileView/FVArrowButtonCell.h
trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFileView.h
trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFileView.m
trunk/bibdesk_vendorsrc/amaxwell/FileView/FVOperation.h
trunk/bibdesk_vendorsrc/amaxwell/FileView/FVProgressIndicatorCell.h
trunk/bibdesk_vendorsrc/amaxwell/FileView/FileView_Prefix.pch
Modified: trunk/bibdesk_vendorsrc/amaxwell/FileView/FVArrowButtonCell.h
===================================================================
--- trunk/bibdesk_vendorsrc/amaxwell/FileView/FVArrowButtonCell.h
2024-01-22 15:44:56 UTC (rev 28649)
+++ trunk/bibdesk_vendorsrc/amaxwell/FileView/FVArrowButtonCell.h
2024-01-22 16:39:32 UTC (rev 28650)
@@ -40,11 +40,10 @@
/** @file FVArrowButtonCell.h Arrow button for page changes. */
-enum {
+typedef NS_ENUM(NSUInteger, FVArrowDirection) {
FVArrowRight = 0,
FVArrowLeft = 1
};
-typedef NSUInteger FVArrowDirection;
/** @internal @brief Circular arrow button.
Modified: trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFileView.h
===================================================================
--- trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFileView.h 2024-01-22
15:44:56 UTC (rev 28649)
+++ trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFileView.h 2024-01-22
16:39:32 UTC (rev 28650)
@@ -54,19 +54,17 @@
FVReloadMenuItemTag = 1013
};
-enum {
+typedef NS_ENUM(NSUInteger, FVDropOperation) {
FVDropOn,
FVDropBefore,
FVDropAfter
};
-typedef NSUInteger FVDropOperation;
-enum {
+typedef NS_ENUM(NSInteger, FVDisplayMode) {
FVDisplayModeGrid,
FVDisplayModeColumn,
FVDisplayModeRow
};
-typedef NSInteger FVDisplayMode;
@class FVFileView;
Modified: trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFileView.m
===================================================================
--- trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFileView.m 2024-01-22
15:44:56 UTC (rev 28649)
+++ trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFileView.m 2024-01-22
16:39:32 UTC (rev 28650)
@@ -148,11 +148,10 @@
#if !defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MAX_ALLOWED <
MAC_OS_X_VERSION_10_7
-enum {
+typedef NS_ENUM(NSInteger, NSScrollerStyle) {
NSScrollerStyleLegacy,
NSScrollerStyleOverlay
};
-typedef NSInteger NSScrollerStyle;
@interface NSScroller (FVLionDeclarations)
- (NSScrollerStyle)scrollerStyle;
@@ -181,12 +180,11 @@
- (NSColor *)tertiaryLabelColor;
@end
-enum {
+typedef NS_ENUM(NSInteger, NSAccessibilityOrientation) {
NSAccessibilityOrientationUnknown,
NSAccessibilityOrientationVertical,
NSAccessibilityOrientationHorizontal
};
-typedef NSInteger NSAccessibilityOrientation;
#endif
Modified: trunk/bibdesk_vendorsrc/amaxwell/FileView/FVOperation.h
===================================================================
--- trunk/bibdesk_vendorsrc/amaxwell/FileView/FVOperation.h 2024-01-22
15:44:56 UTC (rev 28649)
+++ trunk/bibdesk_vendorsrc/amaxwell/FileView/FVOperation.h 2024-01-22
16:39:32 UTC (rev 28650)
@@ -40,7 +40,7 @@
/** @file FVOperation.h Abstract operation. */
-enum {
+typedef NS_ENUM(int32_t, FVOperationQueuePriority) {
FVOperationQueuePriorityVeryLow = -8,
FVOperationQueuePriorityLow = -4,
FVOperationQueuePriorityNormal = 0,
@@ -47,7 +47,6 @@
FVOperationQueuePriorityHigh = 4,
FVOperationQueuePriorityVeryHigh = 8
};
-typedef int32_t FVOperationQueuePriority;
/** FVOperation abstract class.
Modified: trunk/bibdesk_vendorsrc/amaxwell/FileView/FVProgressIndicatorCell.h
===================================================================
--- trunk/bibdesk_vendorsrc/amaxwell/FileView/FVProgressIndicatorCell.h
2024-01-22 15:44:56 UTC (rev 28649)
+++ trunk/bibdesk_vendorsrc/amaxwell/FileView/FVProgressIndicatorCell.h
2024-01-22 16:39:32 UTC (rev 28650)
@@ -46,11 +46,10 @@
4) spinning NSProgressIndicator has some undocumented maximum size (32x32?)
*/
-enum {
+typedef NS_ENUM(NSInteger, FVProgressIndicatorStyle) {
FVProgressIndicatorIndeterminate = -1,
FVProgressIndicatorDeterminate = 0
};
-typedef NSInteger FVProgressIndicatorStyle;
@interface FVProgressIndicatorCell : NSObject
{
Modified: trunk/bibdesk_vendorsrc/amaxwell/FileView/FileView_Prefix.pch
===================================================================
--- trunk/bibdesk_vendorsrc/amaxwell/FileView/FileView_Prefix.pch
2024-01-22 15:44:56 UTC (rev 28649)
+++ trunk/bibdesk_vendorsrc/amaxwell/FileView/FileView_Prefix.pch
2024-01-22 16:39:32 UTC (rev 28650)
@@ -68,6 +68,14 @@
#define CGFLOAT_DEFINED 1
#endif /* CGFLOAT_DEFINED */
+#ifndef NS_ENUM
+#define NS_ENUM(_type, _name) enum _name : _type _name; enum _name : _type
+#endif
+
+#ifndef NS_OPTIONS
+#define NS_OPTIONS(_type, _name) enum _name : _type _name; enum _name : _type
+#endif
+
#if !defined(MAC_OS_X_VERSION_10_13) || MAC_OS_X_VERSION_MAX_ALLOWED <
MAC_OS_X_VERSION_10_13
#ifndef NSAppKitVersionNumber10_6
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
