Replace some NSDictionaries with literals

* [NSDictionary dictionary] → @{}
* [NSDictionary dictionaryWithObject:forKey:] can safely be replaced. object==nil would have already thrown a NPE in the past.
* Also replaced some (hopefully safe) NSArray initializers (ie. their objects should always exist).

3 files changed, 18 insertions, 18 deletions

diff --git a/Frameworks/PSMTabBar/PSMTabBarControl.m b/Frameworks/PSMTabBar/PSMTabBarControl.m
index 55f9dfcd..7c1b059c 100644
--- a/Frameworks/PSMTabBar/PSMTabBarControl.m
+++ b/Frameworks/PSMTabBar/PSMTabBarControl.m
@@ -193,7 +193,7 @@
     if (self) {
         // Initialization
         [self initAddedProperties];
-        [self registerForDraggedTypes:[NSArray arrayWithObjects:@"PSMTabBarControlItemPBType", nil]];
+        [self registerForDraggedTypes:@[@"PSMTabBarControlItemPBType"]];
 		
 		// resize
 		[self setPostsFrameChangedNotifications:YES];
@@ -1990,7 +1990,7 @@
 
             // Initialization
         [self initAddedProperties];
-        [self registerForDraggedTypes:[NSArray arrayWithObjects:@"PSMTabBarControlItemPBType", nil]];
+        [self registerForDraggedTypes:@[@"PSMTabBarControlItemPBType"]];
     
         if ([aDecoder allowsKeyedCoding]) {
             _cells = [[aDecoder decodeObjectForKey:@"PSMcells"] retain];
diff --git a/Frameworks/PSMTabBar/PSMTabDragAssistant.m b/Frameworks/PSMTabBar/PSMTabDragAssistant.m
index bb2d255a..f10eadd4 100644
--- a/Frameworks/PSMTabBar/PSMTabDragAssistant.m
+++ b/Frameworks/PSMTabBar/PSMTabDragAssistant.m
@@ -192,7 +192,7 @@ static PSMTabDragAssistant *sharedDragAssistant = nil;
     }
     [cell setHighlighted:NO];
     NSSize offset = NSZeroSize;
-    [pboard declareTypes:[NSArray arrayWithObjects:@"PSMTabBarControlItemPBType", nil] owner: nil];
+	[pboard declareTypes:@[@"PSMTabBarControlItemPBType"] owner:nil];
     [pboard setString:[[NSNumber numberWithInteger:[[control cells] indexOfObject:cell]] stringValue] forType:@"PSMTabBarControlItemPBType"];
     _animationTimer = [NSTimer scheduledTimerWithTimeInterval:(1.0/30.0) target:self selector:@selector(animateDrag:) userInfo:nil repeats:YES];
     
@@ -768,7 +768,7 @@ static PSMTabDragAssistant *sharedDragAssistant = nil;
     PSMTabBarControl *tabBar;
     while ( (tabBar = [e nextObject]) ) {
         [self calculateDragAnimationForTabBar:tabBar];
-        [[NSRunLoop currentRunLoop] performSelector:@selector(display) target:tabBar argument:nil order:1 modes:[NSArray arrayWithObjects:@"NSEventTrackingRunLoopMode", @"NSDefaultRunLoopMode", nil]];
+		[[NSRunLoop currentRunLoop] performSelector:@selector(display) target:tabBar argument:nil order:1 modes:@[@"NSEventTrackingRunLoopMode", @"NSDefaultRunLoopMode"]];
     }
 }
 
diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m
index 79d5060a..0d9d16ff 100644
--- a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m
+++ b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m
@@ -377,20 +377,20 @@ const char *SPMySQLSSLPermissibleCiphers = "DHE-RSA-AES256-SHA:AES256-SHA:DHE-RS
 {
 	NSFileManager *fileManager = [NSFileManager defaultManager];
 
-	NSArray *possibleSocketLocations = [NSArray arrayWithObjects:
-										@"/tmp/mysql.sock",							// Default
-										@"/Applications/MAMP/tmp/mysql/mysql.sock",	// MAMP default location
-										@"/Applications/xampp/xamppfiles/var/mysql/mysql.sock", // XAMPP default location
-										@"/var/mysql/mysql.sock",					// Mac OS X Server default
-										@"/opt/local/var/run/mysqld/mysqld.sock",	// Darwinports MySQL
-										@"/opt/local/var/run/mysql4/mysqld.sock",	// Darwinports MySQL 4
-										@"/opt/local/var/run/mysql5/mysqld.sock",	// Darwinports MySQL 5
-										@"/usr/local/zend/mysql/tmp/mysql.sock",	// Zend Server CE (see Issue #1251)
-										@"/var/run/mysqld/mysqld.sock",				// As used on Debian/Gentoo
-										@"/var/tmp/mysql.sock",						// As used on FreeBSD
-										@"/var/lib/mysql/mysql.sock",				// As used by Fedora
-										@"/opt/local/lib/mysql/mysql.sock",			// Alternate fedora
-										nil];
+	NSArray *possibleSocketLocations = @[
+			@"/tmp/mysql.sock",                                     // Default
+			@"/Applications/MAMP/tmp/mysql/mysql.sock",             // MAMP default location
+			@"/Applications/xampp/xamppfiles/var/mysql/mysql.sock", // XAMPP default location
+			@"/var/mysql/mysql.sock",                               // Mac OS X Server default
+			@"/opt/local/var/run/mysqld/mysqld.sock",               // Darwinports MySQL
+			@"/opt/local/var/run/mysql4/mysqld.sock",               // Darwinports MySQL 4
+			@"/opt/local/var/run/mysql5/mysqld.sock",               // Darwinports MySQL 5
+			@"/usr/local/zend/mysql/tmp/mysql.sock",                // Zend Server CE (see Issue #1251)
+			@"/var/run/mysqld/mysqld.sock",                         // As used on Debian/Gentoo
+			@"/var/tmp/mysql.sock",                                 // As used on FreeBSD
+			@"/var/lib/mysql/mysql.sock",                           // As used by Fedora
+			@"/opt/local/lib/mysql/mysql.sock"
+	];
 
 	for (NSUInteger i = 0; i < [possibleSocketLocations count]; i++) {
 		if ([fileManager fileExistsAtPath:[possibleSocketLocations objectAtIndex:i]])