From 984f59bb837a415ccbe810ad68fd98dae0017f42 Mon Sep 17 00:00:00 2001 From: Allan Odgaard Date: Fri, 23 Apr 2021 08:24:10 +0200 Subject: [PATCH] =?UTF-8?q?Use=20enumeration=20for=20OakPerformTableViewAc?= =?UTF-8?q?tion=E2=80=A6=20return=20values?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Frameworks/OakAppKit/src/OakAppKit.h | 10 ++++++---- Frameworks/OakAppKit/src/OakAppKit.mm | 5 ----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Frameworks/OakAppKit/src/OakAppKit.h b/Frameworks/OakAppKit/src/OakAppKit.h index f5f0bd76b5..361abffecd 100644 --- a/Frameworks/OakAppKit/src/OakAppKit.h +++ b/Frameworks/OakAppKit/src/OakAppKit.h @@ -3,10 +3,12 @@ extern NSNotificationName const OakCursorDidHideNotification; BOOL OakIsAlternateKeyOrMouseEvent (NSUInteger flags = NSEventModifierFlagOption, NSEvent* anEvent = [NSApp currentEvent]); -extern NSUInteger const OakMoveMoveReturn; -extern NSUInteger const OakMoveAcceptReturn; -extern NSUInteger const OakMoveCancelReturn; -extern NSUInteger const OakMoveNoActionReturn; +typedef NS_ENUM(NSUInteger, OakPerformTableViewActionResult) { + OakMoveMoveReturn, + OakMoveAcceptReturn, + OakMoveCancelReturn, + OakMoveNoActionReturn, +}; NSUInteger OakPerformTableViewActionFromKeyEvent (NSTableView* tableView, NSEvent* event); NSUInteger OakPerformTableViewActionFromSelector (NSTableView* tableView, SEL selector); diff --git a/Frameworks/OakAppKit/src/OakAppKit.mm b/Frameworks/OakAppKit/src/OakAppKit.mm index 451e32bc09..ed38ec81cf 100644 --- a/Frameworks/OakAppKit/src/OakAppKit.mm +++ b/Frameworks/OakAppKit/src/OakAppKit.mm @@ -34,11 +34,6 @@ BOOL OakIsAlternateKeyOrMouseEvent (NSUInteger flags, NSEvent* anEvent) static NSString* const kUserDefaultsEnableLoopFilterList = @"enableLoopFilterList"; -NSUInteger const OakMoveMoveReturn = 0; -NSUInteger const OakMoveAcceptReturn = 1; -NSUInteger const OakMoveCancelReturn = 2; -NSUInteger const OakMoveNoActionReturn = 3; - @interface OakTableViewActionHelper : NSResponder @property (nonatomic) NSTableView* tableView; @property (nonatomic) NSUInteger returnCode;