Getting rid of commented-out code.

Other minor changes.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85565 e17a0e51-4ae3-4d35-97c3-1a29b211df97

4 files changed, 4 insertions, 69 deletions

diff --git a/macosx/CheatController.m b/macosx/CheatController.m
index edc23a98..ebb0d4b9 100644
--- a/macosx/CheatController.m
+++ b/macosx/CheatController.m
@@ -33,10 +33,10 @@
         return nil;
     NSString *ident = [col identifier];
     if ([ident isEqualToString:@"COL_NAME"]) {
-        return [NSString stringWithCString:Cheats[idx].Descr encoding:NSUTF8StringEncoding];
+        return @(Cheats[idx].Descr);
     }
     if ([ident isEqualToString:@"COL_ENABLE"]) {
-        return [NSNumber numberWithInt: Cheats[idx].Enabled ? NSOnState : NSOffState];
+        return @(Cheats[idx].Enabled ? NSOnState : NSOffState);
     }
     NSLog(@"Unknown column identifier: %@", ident);
     return nil;
diff --git a/macosx/ConfigurationController.m b/macosx/ConfigurationController.m
index 0ba7dd79..0eb44642 100755
--- a/macosx/ConfigurationController.m
+++ b/macosx/ConfigurationController.m
@@ -23,10 +23,8 @@ NSString *const memCardChangeNumberKey = @"PcsxrMemoryCardThatChangedKey";
 		strlcpy(Config.Mcd2, [[theURL path] fileSystemRepresentation], MAXPATHLEN );
 	}
 	
-	NSDictionary *userDict = [NSDictionary dictionaryWithObject:@(theCard) forKey:memCardChangeNumberKey];
-	
-	[[NSNotificationCenter defaultCenter] postNotificationName:memChangeNotifier object:nil userInfo:userDict];
-
+	[[NSNotificationCenter defaultCenter] postNotificationName:memChangeNotifier object:nil userInfo:
+	 [NSDictionary dictionaryWithObject:@(theCard) forKey:memCardChangeNumberKey]];
 }
 
 + (void)setMemoryCard:(int)theCard toPath:(NSString *)theFile
diff --git a/macosx/EmuThread.m b/macosx/EmuThread.m
index 01d574d1..d3888ac2 100755
--- a/macosx/EmuThread.m
+++ b/macosx/EmuThread.m
@@ -388,7 +388,6 @@ done:
 		if (!emuWasPaused) {
 			[EmuThread resume];
 		}
-		
 	}];
 }
 
diff --git a/macosx/PluginList.m b/macosx/PluginList.m
index 330f8be7..fac8f4b4 100755
--- a/macosx/PluginList.m
+++ b/macosx/PluginList.m
@@ -24,68 +24,6 @@ const static int typeList[5] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD,
 	return sPluginList;
 }
 
-#if 0
-+ (void)loadPlugins
-{
-    NSDirectoryEnumerator *dirEnum;
-    NSString *pname, *dir;
-    
-    // Make sure we only load the plugins once
-    if (plugins != nil)
-        return;
-    
-    plugins = [[NSMutableArray alloc] initWithCapacity: 20];
-
-    dir = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:Config.PluginsDir length:strlen(Config.PluginsDir)];
-    dirEnum = [[NSFileManager defaultManager] enumeratorAtPath:dir];
-    
-    while (pname = [dirEnum nextObject]) {
-        if ([[pname pathExtension] isEqualToString:@"psxplugin"] || 
-            [[pname pathExtension] isEqualToString:@"so"]) {
-            [dirEnum skipDescendents]; /* don't enumerate this
-                                            directory */
-            
-            PcsxrPlugin *plugin = [[PcsxrPlugin alloc] initWithPath:pname];
-            if (plugin != nil) {
-                [plugins addObject:plugin];
-            }
-        }
-    }
-}
-
-- (id)initWithType:(int)typeMask
-{
-    unsigned int i;
-    
-    self = [super init];
-
-    [PluginList loadPlugins];
-    list = [[NSMutableArray alloc] initWithCapacity: 5];
-    
-    type = typeMask;
-    for (i=0; i<[plugins count]; i++) {
-        PcsxrPlugin *plugin = [plugins objectAtIndex:i];
-        if ([plugin type] == type) {
-            [list addObject:plugin];
-        }
-    }
-    
-    return self;
-}
-
-- (int)numberOfItems
-{
-    return [list count];
-}
-
-- (id)objectAtIndex:(unsigned)index
-{
-	return [list objectAtIndex:index];
-}
-#endif
-
-
-
 - (id)init
 {
 	NSUInteger i;