aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPPreferenceControllerDelegate.m
diff options
context:
space:
mode:
authorAbhi Beckert <abhi@Twist-of-Lemon-2.local>2015-05-16 08:06:06 +1000
committerAbhi Beckert <abhi@Twist-of-Lemon-2.local>2015-05-16 08:06:06 +1000
commit57a6f6c73bdaa202164645370d37fcbe5d14a092 (patch)
treedd30aa6156064f1d4c0e10ea87059625470fc2f9 /Source/SPPreferenceControllerDelegate.m
parentb5e972f4504043dfb9c358e272e93fb59ae2127f (diff)
parent0f0c43eb74408b6a65a42e2c6fd46f4142ef8e3f (diff)
downloadsequelpro-57a6f6c73bdaa202164645370d37fcbe5d14a092.tar.gz
sequelpro-57a6f6c73bdaa202164645370d37fcbe5d14a092.tar.bz2
sequelpro-57a6f6c73bdaa202164645370d37fcbe5d14a092.zip
Merge remote-tracking branch 'sequelpro/master'
Diffstat (limited to 'Source/SPPreferenceControllerDelegate.m')
-rw-r--r--Source/SPPreferenceControllerDelegate.m62
1 files changed, 31 insertions, 31 deletions
diff --git a/Source/SPPreferenceControllerDelegate.m b/Source/SPPreferenceControllerDelegate.m
index ca08f2f0..6a16de0f 100644
--- a/Source/SPPreferenceControllerDelegate.m
+++ b/Source/SPPreferenceControllerDelegate.m
@@ -62,7 +62,7 @@
#pragma mark -
#pragma mark Toolbar delegate methods
-- (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag
+- (NSToolbarItem *)toolbar:(NSToolbar *)aToolbar itemForItemIdentifier:(NSString *)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag
{
if ([itemIdentifier isEqualToString:SPPreferenceToolbarGeneral]) {
return generalItem;
@@ -89,43 +89,43 @@
return [[[NSToolbarItem alloc] initWithItemIdentifier:itemIdentifier] autorelease];
}
-- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar
+- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)aToolbar
{
- return [NSArray arrayWithObjects:
- SPPreferenceToolbarGeneral,
- SPPreferenceToolbarTables,
- SPPreferenceToolbarNotifications,
- SPPreferenceToolbarEditor,
- SPPreferenceToolbarShortcuts,
- SPPreferenceToolbarAutoUpdate,
- SPPreferenceToolbarNetwork,
- nil];
+ return @[
+ SPPreferenceToolbarGeneral,
+ SPPreferenceToolbarTables,
+ SPPreferenceToolbarNotifications,
+ SPPreferenceToolbarEditor,
+ SPPreferenceToolbarShortcuts,
+ SPPreferenceToolbarAutoUpdate,
+ SPPreferenceToolbarNetwork
+ ];
}
-- (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar *)toolbar
+- (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar *)aToolbar
{
- return [NSArray arrayWithObjects:
- SPPreferenceToolbarGeneral,
- SPPreferenceToolbarTables,
- SPPreferenceToolbarNotifications,
- SPPreferenceToolbarEditor,
- SPPreferenceToolbarShortcuts,
- SPPreferenceToolbarAutoUpdate,
- SPPreferenceToolbarNetwork,
- nil];
+ return @[
+ SPPreferenceToolbarGeneral,
+ SPPreferenceToolbarTables,
+ SPPreferenceToolbarNotifications,
+ SPPreferenceToolbarEditor,
+ SPPreferenceToolbarShortcuts,
+ SPPreferenceToolbarAutoUpdate,
+ SPPreferenceToolbarNetwork
+ ];
}
-- (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)toolbar
+- (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)aToolbar
{
- return [NSArray arrayWithObjects:
- SPPreferenceToolbarGeneral,
- SPPreferenceToolbarTables,
- SPPreferenceToolbarNotifications,
- SPPreferenceToolbarEditor,
- SPPreferenceToolbarShortcuts,
- SPPreferenceToolbarAutoUpdate,
- SPPreferenceToolbarNetwork,
- nil];
+ return @[
+ SPPreferenceToolbarGeneral,
+ SPPreferenceToolbarTables,
+ SPPreferenceToolbarNotifications,
+ SPPreferenceToolbarEditor,
+ SPPreferenceToolbarShortcuts,
+ SPPreferenceToolbarAutoUpdate,
+ SPPreferenceToolbarNetwork
+ ];
}
@end