aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Source/SPPreferenceController.h1
-rw-r--r--Source/SPPreferenceController.m10
-rw-r--r--Source/SPPreferenceControllerDelegate.m8
3 files changed, 12 insertions, 7 deletions
diff --git a/Source/SPPreferenceController.h b/Source/SPPreferenceController.h
index c34f8542..3434663e 100644
--- a/Source/SPPreferenceController.h
+++ b/Source/SPPreferenceController.h
@@ -61,7 +61,6 @@
NSToolbarItem *generalItem;
NSToolbarItem *notificationsItem;
NSToolbarItem *tablesItem;
- NSToolbarItem *favoritesItem;
NSToolbarItem *autoUpdateItem;
NSToolbarItem *networkItem;
NSToolbarItem *editorItem;
diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m
index 36954bc8..fad1d95b 100644
--- a/Source/SPPreferenceController.m
+++ b/Source/SPPreferenceController.m
@@ -128,14 +128,14 @@
[prefs setObject:[NSArchiver archivedDataWithRootObject:font] forKey:SPGlobalResultTableFont];
- [(SPTablesPreferencePane *)tablesPreferencePane updateDisplayedTableFontName];
+ [tablesPreferencePane updateDisplayedTableFontName];
break;
case SPPrefFontChangeTargetEditor:
font = [[NSFontPanel sharedFontPanel] panelConvertFont:[NSUnarchiver unarchiveObjectWithData:[prefs dataForKey:SPCustomQueryEditorFont]]];
[prefs setObject:[NSArchiver archivedDataWithRootObject:font] forKey:SPCustomQueryEditorFont];
- [(SPEditorPreferencePane *)editorPreferencePane updateDisplayedEditorFontName];
+ [editorPreferencePane updateDisplayedEditorFontName];
break;
}
}
@@ -231,6 +231,12 @@
- (void)dealloc
{
SPClear(preferencePanes);
+ SPClear(generalItem);
+ SPClear(tablesItem);
+ SPClear(notificationsItem);
+ SPClear(editorItem);
+ SPClear(autoUpdateItem);
+ SPClear(networkItem);
[super dealloc];
}
diff --git a/Source/SPPreferenceControllerDelegate.m b/Source/SPPreferenceControllerDelegate.m
index ce05de6c..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,7 +89,7 @@
return [[[NSToolbarItem alloc] initWithItemIdentifier:itemIdentifier] autorelease];
}
-- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar
+- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)aToolbar
{
return @[
SPPreferenceToolbarGeneral,
@@ -102,7 +102,7 @@
];
}
-- (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar *)toolbar
+- (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar *)aToolbar
{
return @[
SPPreferenceToolbarGeneral,
@@ -115,7 +115,7 @@
];
}
-- (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)toolbar
+- (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)aToolbar
{
return @[
SPPreferenceToolbarGeneral,