From a3ac4842bd5c7058b1363f7d3307f61724fc7178 Mon Sep 17 00:00:00 2001 From: "SND\\MaddTheSane_cp" Date: Tue, 10 Sep 2013 18:18:15 +0000 Subject: Remove 32-bit support on OS X. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@87114 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- macosx/plugins/DFInput/macsrc/ControllerList.m | 2 -- macosx/plugins/DFInput/macsrc/PadController.m | 7 +------ macosx/plugins/DFInput/macsrc/PadView.m | 10 ---------- macosx/plugins/DFInput/macsrc/cfgHelper.m | 1 - 4 files changed, 1 insertion(+), 19 deletions(-) (limited to 'macosx/plugins/DFInput/macsrc') diff --git a/macosx/plugins/DFInput/macsrc/ControllerList.m b/macosx/plugins/DFInput/macsrc/ControllerList.m index a88058bc..ed486314 100755 --- a/macosx/plugins/DFInput/macsrc/ControllerList.m +++ b/macosx/plugins/DFInput/macsrc/ControllerList.m @@ -20,7 +20,6 @@ */ #import "ControllerList.h" -#import "ARCBridge.h" #include "pad.h" #include "cfg.h" @@ -63,7 +62,6 @@ static NSArray *labelText; [plugBundle localizedStringForKey:@"R-Stick Left" value:@"" table:nil], [plugBundle localizedStringForKey:@"R-Stick Down" value:@"" table:nil], [plugBundle localizedStringForKey:@"R-Stick Up" value:@"" table:nil]]; - RETAINOBJNORETURN(labelText); }); } return self; diff --git a/macosx/plugins/DFInput/macsrc/PadController.m b/macosx/plugins/DFInput/macsrc/PadController.m index 91f0baf0..f667717a 100755 --- a/macosx/plugins/DFInput/macsrc/PadController.m +++ b/macosx/plugins/DFInput/macsrc/PadController.m @@ -21,7 +21,6 @@ #import #import "PadController.h" -#import "ARCBridge.h" #include "pad.h" static inline void RunOnMainThreadSync(dispatch_block_t block) @@ -330,8 +329,6 @@ void SavePADConfig() pad2Dict, kDFPad2, nil] forKey:PrefsKey]; [defaults synchronize]; - RELEASEOBJ(pad1Dict); - RELEASEOBJ(pad2Dict); } void DoAbout() @@ -345,9 +342,8 @@ void DoAbout() if (path) { credits = [[NSAttributedString alloc] initWithPath: path documentAttributes:NULL]; - AUTORELEASEOBJNORETURN(credits); } else { - credits = AUTORELEASEOBJ([[NSAttributedString alloc] initWithString:@""]); + credits = [[NSAttributedString alloc] initWithString:@""]; } // Get Application Icon @@ -367,7 +363,6 @@ void DoAbout() dispatch_async(dispatch_get_main_queue(), ^{ [NSApp orderFrontStandardAboutPanelWithOptions:infoPaneDict]; }); - RELEASEOBJ(infoPaneDict); } long DoConfiguration() diff --git a/macosx/plugins/DFInput/macsrc/PadView.m b/macosx/plugins/DFInput/macsrc/PadView.m index 7cafa4b1..f8936888 100755 --- a/macosx/plugins/DFInput/macsrc/PadView.m +++ b/macosx/plugins/DFInput/macsrc/PadView.m @@ -20,7 +20,6 @@ */ #import "PadView.h" -#import "ARCBridge.h" #include "pad.h" @implementation PadView @@ -34,14 +33,6 @@ return self; } -#if !__has_feature(objc_arc) -- (void)dealloc -{ - [controller release]; - [super dealloc]; -} -#endif - - (void)drawRect:(NSRect)rect { } @@ -80,7 +71,6 @@ #endif [joystickItem setTag:i + 1]; [[deviceMenu menu] addItem:joystickItem]; - RELEASEOBJ(joystickItem); } if (g.cfg.PadDef[which].DevNum >= SDL_NumJoysticks()) { diff --git a/macosx/plugins/DFInput/macsrc/cfgHelper.m b/macosx/plugins/DFInput/macsrc/cfgHelper.m index e15a9a1e..406252fc 100644 --- a/macosx/plugins/DFInput/macsrc/cfgHelper.m +++ b/macosx/plugins/DFInput/macsrc/cfgHelper.m @@ -7,7 +7,6 @@ // #import -#import "ARCBridge.h" #import "PadController.h" #include "cfg.h" -- cgit v1.2.3