diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2014-11-16 21:05:39 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2014-11-16 21:05:39 +0000 |
| commit | 759e29705c38cc58880dc892da2c28e8a84c2fac (patch) | |
| tree | fe332d151b01fe7f85d756ca6cf6c9303be44e82 /macosx/Source/PcsxrMemoryObject.h | |
| parent | eded81ac8a46a6948a18bea53bb9388f519c052b (diff) | |
| download | pcsxr-759e29705c38cc58880dc892da2c28e8a84c2fac.tar.gz | |
OS X: Re-work PcsxrMemoryObject to make the properties more readable.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@92297 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/Source/PcsxrMemoryObject.h')
| -rw-r--r-- | macosx/Source/PcsxrMemoryObject.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/macosx/Source/PcsxrMemoryObject.h b/macosx/Source/PcsxrMemoryObject.h index 6076fb68..1223cd24 100644 --- a/macosx/Source/PcsxrMemoryObject.h +++ b/macosx/Source/PcsxrMemoryObject.h @@ -9,7 +9,7 @@ #import <Cocoa/Cocoa.h> #include "sio.h" -typedef NS_ENUM(char, PCSXRMemFlags) { +typedef NS_ENUM(char, PCSXRMemFlag) { memFlagDeleted, memFlagFree, memFlagUsed, @@ -20,28 +20,28 @@ typedef NS_ENUM(char, PCSXRMemFlags) { @interface PcsxrMemoryObject : NSObject + (NSArray *)imagesFromMcd:(McdBlock *)block; -+ (NSString*)memoryLabelFromFlag:(PCSXRMemFlags)flagNameIndex; ++ (NSString*)memoryLabelFromFlag:(PCSXRMemFlag)flagNameIndex; + (NSImage *)blankImage; -+ (PCSXRMemFlags)memFlagsFromBlockFlags:(unsigned char)blockFlags; ++ (PCSXRMemFlag)memFlagsFromBlockFlags:(unsigned char)blockFlags; - (instancetype)initWithMcdBlock:(McdBlock *)infoBlockc startingIndex:(uint8_t)startIdx size:(uint8_t)memSize NS_DESIGNATED_INITIALIZER; - (NSImage*)memoryImageAtIndex:(NSInteger)idx; +@property (readonly, copy) NSString *title; @property (readonly, copy) NSString *name; -@property (readonly, copy) NSString *memName; -@property (readonly, copy) NSString *memID; -@property (readonly, strong) NSArray *memoryCardImages; -@property (readonly, strong, nonatomic) NSImage *memImage; -@property (readonly) PCSXRMemFlags flagNameIndex; +@property (readonly, copy) NSString *identifier; +@property (readonly, strong) NSArray *imageArray; +@property (readonly, strong, nonatomic) NSImage *image; +@property (readonly) PCSXRMemFlag flag; @property (readonly) uint8_t startingIndex; @property (readonly) uint8_t blockSize; @property (readonly) BOOL hasImages; -@property (readonly, copy) NSImage *firstMemImage; -@property (readonly, nonatomic) NSUInteger memIconCount; +@property (readonly, copy) NSImage *firstImage; +@property (readonly, nonatomic) NSUInteger iconCount; @property (readonly, unsafe_unretained, nonatomic) NSString *flagName; @property (readonly, unsafe_unretained, nonatomic) NSAttributedString *attributedFlagName; -@property (readonly, nonatomic) BOOL isBiggerThanOne; +@property (readonly, nonatomic) BOOL showCount; @end |