Fixed memory leaks

Removed obsolete CreationViewController references
This commit is contained in:
michael starke
2013-06-26 03:50:23 +02:00
parent 84485d7233
commit 17f2155aa4
13 changed files with 41 additions and 17 deletions

View File

@@ -50,6 +50,7 @@
- (void)dealloc { - (void)dealloc {
[_settingsController release]; [_settingsController release];
[_passwordCreatorController release]; [_passwordCreatorController release];
[_passwordCreatorWindow release];
[serverDaemon release]; [serverDaemon release];
[lockDaemon release]; [lockDaemon release];
[super dealloc]; [super dealloc];

View File

@@ -36,7 +36,7 @@ APPKIT_EXTERN NSString *const MPDocumentGroupKey;
@property (assign, readonly, getter = isDecrypted) BOOL decrypted; @property (assign, readonly, getter = isDecrypted) BOOL decrypted;
@property (retain, readonly) KdbTree *tree; @property (retain, readonly) KdbTree *tree;
@property (assign, readonly, nonatomic) KdbGroup *root; @property (assign, readonly, nonatomic) KdbGroup *root;
@property (nonatomic,retain) NSString *password; @property (nonatomic, retain) NSString *password;
@property (nonatomic, retain) NSURL *key; @property (nonatomic, retain) NSURL *key;
@property (assign, readonly) MPDatabaseVersion version; @property (assign, readonly) MPDatabaseVersion version;

View File

@@ -70,6 +70,13 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey";
return self; return self;
} }
- (void)dealloc {
[_tree release];
[_password release];
[_key release];
[super dealloc];
}
- (void)makeWindowControllers { - (void)makeWindowControllers {
MPDocumentWindowController *windowController = [[MPDocumentWindowController alloc] init]; MPDocumentWindowController *windowController = [[MPDocumentWindowController alloc] init];
[self addWindowController:windowController]; [self addWindowController:windowController];

View File

@@ -14,7 +14,6 @@
@class MPPasswordEditViewController; @class MPPasswordEditViewController;
@class MPPasswordInputController; @class MPPasswordInputController;
@class MPOutlineViewController; @class MPOutlineViewController;
@class MPCreationViewController;
@class KdbGroup; @class KdbGroup;
@class KdbEntry; @class KdbEntry;
@@ -28,7 +27,7 @@ APPKIT_EXTERN NSString *const MPCurrentItemChangedNotification;
@property (readonly, retain) MPEntryViewController *entryViewController; @property (readonly, retain) MPEntryViewController *entryViewController;
@property (readonly, retain) MPOutlineViewController *outlineViewController; @property (readonly, retain) MPOutlineViewController *outlineViewController;
@property (readonly, retain) MPInspectorViewController *inspectorViewController; @property (readonly, retain) MPInspectorViewController *inspectorViewController;
@property (readonly, retain) MPCreationViewController *creationViewController;
/* Holds the current item. That is either a KdbGroup or a KdbEntry */ /* Holds the current item. That is either a KdbGroup or a KdbEntry */
@property (readonly, assign) id currentItem; @property (readonly, assign) id currentItem;

View File

@@ -39,7 +39,6 @@ NSString *const MPCurrentItemChangedNotification = @"com.hicknhack.macpass.MPCur
@property (retain) MPToolbarDelegate *toolbarDelegate; @property (retain) MPToolbarDelegate *toolbarDelegate;
@end @end
@implementation MPDocumentWindowController @implementation MPDocumentWindowController
@@ -67,10 +66,10 @@ NSString *const MPCurrentItemChangedNotification = @"com.hicknhack.macpass.MPCur
[_toolbar release]; [_toolbar release];
[_passwordInputController release]; [_passwordInputController release];
[_passwordEditController release];
[_entryViewController release]; [_entryViewController release];
[_outlineViewController release]; [_outlineViewController release];
[_inspectorViewController release]; [_inspectorViewController release];
[_creationViewController release];
[_toolbarDelegate release]; [_toolbarDelegate release];
[_splitView release]; [_splitView release];

View File

@@ -17,12 +17,12 @@ APPKIT_EXTERN NSString *const MPEntryTableURLColumnIdentifier;
APPKIT_EXTERN NSString *const MPDidChangeSelectedEntryNotification; APPKIT_EXTERN NSString *const MPDidChangeSelectedEntryNotification;
/* Tags to determine what to copy */ /* Tags to determine what to copy */
typedef enum { typedef NS_ENUM( NSUInteger, MPCopyContentTypeTag) {
MPCopyUsername, MPCopyUsername,
MPCopyPassword, MPCopyPassword,
MPCopyURL, MPCopyURL,
MPCopyWholeEntry, MPCopyWholeEntry,
} MPCopyContentTypeTag; };
@class KdbGroup; @class KdbGroup;
@class KdbEntry; @class KdbEntry;

View File

@@ -111,12 +111,13 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
- (void)dealloc { - (void)dealloc {
[[NSNotificationCenter defaultCenter] removeObserver:self]; [[NSNotificationCenter defaultCenter] removeObserver:self];
self.entryArrayController = nil; [_entryArrayController release];
self.filteredEntries = nil; [_filteredEntries release];
self.filterBar = nil; [_filter release];
self.tableToTop = nil; [_filterBar release];
self.filterButtonToMode = nil; [_tableToTop release];
self.dataSource = nil; [_dataSource release];
[_filterButtonToMode release];
[super dealloc]; [super dealloc];
} }

View File

@@ -69,6 +69,7 @@ enum {
- (void)dealloc { - (void)dealloc {
[[NSNotificationCenter defaultCenter] removeObserver:self]; [[NSNotificationCenter defaultCenter] removeObserver:self];
[_activePopover release]; [_activePopover release];
[_attachmentsController release];
[super dealloc]; [super dealloc];
} }

View File

@@ -56,6 +56,13 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
return self; return self;
} }
- (void)dealloc {
[_treeController release];
[_datasource release];
[_menu release];
[super dealloc];
}
- (void)didLoadView { - (void)didLoadView {
[_outlineView setDelegate:self]; [_outlineView setDelegate:self];
[_outlineView setMenu:[self _contextMenu]]; [_outlineView setMenu:[self _contextMenu]];

View File

@@ -54,6 +54,12 @@
return self; return self;
} }
- (void)dealloc {
[_generatedPassword release];
[_password release];
[super dealloc];
}
- (void)didLoadView { - (void)didLoadView {
[self.passwordLengthSlider setMinValue:MIN_PASSWORD_LENGTH]; [self.passwordLengthSlider setMinValue:MIN_PASSWORD_LENGTH];
[self.passwordLengthSlider setMaxValue:MAX_PASSWORD_LENGTH]; [self.passwordLengthSlider setMaxValue:MAX_PASSWORD_LENGTH];

View File

@@ -45,6 +45,7 @@
[_settingsController release]; [_settingsController release];
[_toolbar release]; [_toolbar release];
[_toolbarItems release]; [_toolbarItems release];
[_defaultToolbarItems release];
[super dealloc]; [super dealloc];
} }

View File

@@ -48,9 +48,9 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR";
- (void)dealloc - (void)dealloc
{ {
self.toolbarIdentifiers = nil; [_toolbarItems release];
self.toolbarImages = nil; [_toolbarIdentifiers release];
self.toolbarItems = nil; [_toolbarImages release];
[super dealloc]; [super dealloc];
} }
@@ -88,6 +88,7 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR";
[popupButton setFrame:newFrame]; [popupButton setFrame:newFrame];
[popupButton setMenu:menu]; [popupButton setMenu:menu];
[item setMenuFormRepresentation:menuRepresentation]; [item setMenuFormRepresentation:menuRepresentation];
[menuRepresentation release];
[item setView:popupButton]; [item setView:popupButton];
[popupButton release]; [popupButton release];
[menu release]; [menu release];
@@ -113,6 +114,7 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR";
action:[self _actionForToolbarItemIdentifier:itemIdentifier] action:[self _actionForToolbarItemIdentifier:itemIdentifier]
keyEquivalent:@""]; keyEquivalent:@""];
[item setMenuFormRepresentation:menuRepresentation]; [item setMenuFormRepresentation:menuRepresentation];
[menuRepresentation release];
[button release]; [button release];
} }
self.toolbarItems[itemIdentifier] = item; self.toolbarItems[itemIdentifier] = item;

View File

@@ -48,7 +48,7 @@
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1167</string> <string>1175</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string> <string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>NSHumanReadableCopyright</key> <key>NSHumanReadableCopyright</key>