diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj index 5f3718c9..05a4c89c 100644 --- a/MacPass.xcodeproj/project.pbxproj +++ b/MacPass.xcodeproj/project.pbxproj @@ -9,36 +9,36 @@ /* Begin PBXBuildFile section */ 4C01C23F1764D2980016D5D0 /* KdbEntry+Undo.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C01C23E1764D2980016D5D0 /* KdbEntry+Undo.m */; }; 4C01C2421764D8980016D5D0 /* MPContextMenuHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C01C2411764D8980016D5D0 /* MPContextMenuHelper.m */; }; - 4C01C245176500C40016D5D0 /* HNHLevelIndicatorCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C01C244176500C40016D5D0 /* HNHLevelIndicatorCell.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4C0D9B37177F84D700D0857C /* HNHSecureTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0D9B36177F84D700D0857C /* HNHSecureTextView.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4C0D9B3A177F867100D0857C /* HNHSecureLayoutManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0D9B39177F867100D0857C /* HNHSecureLayoutManager.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; + 4C01C245176500C40016D5D0 /* HNHLevelIndicatorCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C01C244176500C40016D5D0 /* HNHLevelIndicatorCell.m */; }; + 4C0D9B37177F84D700D0857C /* HNHSecureTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0D9B36177F84D700D0857C /* HNHSecureTextView.m */; }; + 4C0D9B3A177F867100D0857C /* HNHSecureLayoutManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0D9B39177F867100D0857C /* HNHSecureLayoutManager.m */; }; 4C1DDCDD1711ECEB00C98DA3 /* PasswordCreatorWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C1DDCDC1711ECEB00C98DA3 /* PasswordCreatorWindow.xib */; }; 4C22040D1746ED160054C916 /* KdbGroup+Undo.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C22040C1746ED160054C916 /* KdbGroup+Undo.m */; }; - 4C245B76176E1E3D0086100E /* DDData.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A6A176E1E3C0086100E /* DDData.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4C245B77176E1E3D0086100E /* DDNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A6C176E1E3C0086100E /* DDNumber.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4C245B78176E1E3D0086100E /* DDRange.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A6E176E1E3C0086100E /* DDRange.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4C245B79176E1E3D0086100E /* HTTPAuthenticationRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A70176E1E3C0086100E /* HTTPAuthenticationRequest.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4C245B7A176E1E3D0086100E /* HTTPConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A72176E1E3C0086100E /* HTTPConnection.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4C245B7B176E1E3D0086100E /* HTTPMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A75176E1E3C0086100E /* HTTPMessage.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4C245B7C176E1E3D0086100E /* HTTPServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A78176E1E3C0086100E /* HTTPServer.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; + 4C245B76176E1E3D0086100E /* DDData.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A6A176E1E3C0086100E /* DDData.m */; }; + 4C245B77176E1E3D0086100E /* DDNumber.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A6C176E1E3C0086100E /* DDNumber.m */; }; + 4C245B78176E1E3D0086100E /* DDRange.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A6E176E1E3C0086100E /* DDRange.m */; }; + 4C245B79176E1E3D0086100E /* HTTPAuthenticationRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A70176E1E3C0086100E /* HTTPAuthenticationRequest.m */; }; + 4C245B7A176E1E3D0086100E /* HTTPConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A72176E1E3C0086100E /* HTTPConnection.m */; }; + 4C245B7B176E1E3D0086100E /* HTTPMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A75176E1E3C0086100E /* HTTPMessage.m */; }; + 4C245B7C176E1E3D0086100E /* HTTPServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A78176E1E3C0086100E /* HTTPServer.m */; }; 4C245B7D176E1E3D0086100E /* MultipartFormDataParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A7B176E1E3C0086100E /* MultipartFormDataParser.m */; }; 4C245B7E176E1E3D0086100E /* MultipartMessageHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A7D176E1E3C0086100E /* MultipartMessageHeader.m */; }; 4C245B7F176E1E3D0086100E /* MultipartMessageHeaderField.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A7F176E1E3C0086100E /* MultipartMessageHeaderField.m */; }; - 4C245B80176E1E3D0086100E /* HTTPAsyncFileResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A82176E1E3C0086100E /* HTTPAsyncFileResponse.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4C245B81176E1E3D0086100E /* HTTPDataResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A84176E1E3C0086100E /* HTTPDataResponse.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4C245B82176E1E3D0086100E /* HTTPDynamicFileResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A86176E1E3C0086100E /* HTTPDynamicFileResponse.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4C245B83176E1E3D0086100E /* HTTPErrorResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A88176E1E3C0086100E /* HTTPErrorResponse.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4C245B84176E1E3D0086100E /* HTTPFileResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A8A176E1E3C0086100E /* HTTPFileResponse.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4C245B85176E1E3D0086100E /* HTTPRedirectResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A8C176E1E3C0086100E /* HTTPRedirectResponse.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4C245B86176E1E3D0086100E /* WebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A8E176E1E3C0086100E /* WebSocket.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4C245BE9176E1E3D0086100E /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245B61176E1E3D0086100E /* GCDAsyncSocket.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4C245BEB176E1E3D0086100E /* DDAbstractDatabaseLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245B65176E1E3D0086100E /* DDAbstractDatabaseLogger.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4C245BEC176E1E3D0086100E /* DDASLLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245B67176E1E3D0086100E /* DDASLLogger.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4C245BED176E1E3D0086100E /* DDFileLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245B69176E1E3D0086100E /* DDFileLogger.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4C245BEE176E1E3D0086100E /* DDLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245B6B176E1E3D0086100E /* DDLog.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4C245BEF176E1E3D0086100E /* DDTTYLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245B6D176E1E3D0086100E /* DDTTYLogger.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4C245BF0176E1E3D0086100E /* ContextFilterLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245B70176E1E3D0086100E /* ContextFilterLogFormatter.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4C245BF1176E1E3D0086100E /* DispatchQueueLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245B72176E1E3D0086100E /* DispatchQueueLogFormatter.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; + 4C245B80176E1E3D0086100E /* HTTPAsyncFileResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A82176E1E3C0086100E /* HTTPAsyncFileResponse.m */; }; + 4C245B81176E1E3D0086100E /* HTTPDataResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A84176E1E3C0086100E /* HTTPDataResponse.m */; }; + 4C245B82176E1E3D0086100E /* HTTPDynamicFileResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A86176E1E3C0086100E /* HTTPDynamicFileResponse.m */; }; + 4C245B83176E1E3D0086100E /* HTTPErrorResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A88176E1E3C0086100E /* HTTPErrorResponse.m */; }; + 4C245B84176E1E3D0086100E /* HTTPFileResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A8A176E1E3C0086100E /* HTTPFileResponse.m */; }; + 4C245B85176E1E3D0086100E /* HTTPRedirectResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A8C176E1E3C0086100E /* HTTPRedirectResponse.m */; }; + 4C245B86176E1E3D0086100E /* WebSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A8E176E1E3C0086100E /* WebSocket.m */; }; + 4C245BE9176E1E3D0086100E /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245B61176E1E3D0086100E /* GCDAsyncSocket.m */; }; + 4C245BEB176E1E3D0086100E /* DDAbstractDatabaseLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245B65176E1E3D0086100E /* DDAbstractDatabaseLogger.m */; }; + 4C245BEC176E1E3D0086100E /* DDASLLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245B67176E1E3D0086100E /* DDASLLogger.m */; }; + 4C245BED176E1E3D0086100E /* DDFileLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245B69176E1E3D0086100E /* DDFileLogger.m */; }; + 4C245BEE176E1E3D0086100E /* DDLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245B6B176E1E3D0086100E /* DDLog.m */; }; + 4C245BEF176E1E3D0086100E /* DDTTYLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245B6D176E1E3D0086100E /* DDTTYLogger.m */; }; + 4C245BF0176E1E3D0086100E /* ContextFilterLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245B70176E1E3D0086100E /* ContextFilterLogFormatter.m */; }; + 4C245BF1176E1E3D0086100E /* DispatchQueueLogFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245B72176E1E3D0086100E /* DispatchQueueLogFormatter.m */; }; 4C25D58716CF0FAA00F6806C /* EntryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C25D58616CF0FAA00F6806C /* EntryView.xib */; }; 4C2724CE1778EFB100FD8456 /* NSData+Random.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2724CD1778EFB100FD8456 /* NSData+Random.m */; }; 4C2724D11778EFE300FD8456 /* NSString+Empty.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2724D01778EFE300FD8456 /* NSString+Empty.m */; }; @@ -53,29 +53,29 @@ 4C2E382316D1421B00037A9D /* MPIconHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2E382216D1421B00037A9D /* MPIconHelper.m */; }; 4C2E382616D1470200037A9D /* MPViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2E382516D1470200037A9D /* MPViewController.m */; }; 4C36E5B4177CD4FB00152132 /* Kdb4Tree+KVOAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C36E5B3177CD4FB00152132 /* Kdb4Tree+KVOAdditions.m */; }; - 4C37A6731769393300AD0A40 /* HNHTableHeaderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C37A6721769393300AD0A40 /* HNHTableHeaderCell.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; + 4C37A6731769393300AD0A40 /* HNHTableHeaderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C37A6721769393300AD0A40 /* HNHTableHeaderCell.m */; }; 4C37A84015B8B474005EF8EE /* MPOutlineDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C37A83F15B8B474005EF8EE /* MPOutlineDataSource.m */; }; 4C3BD51516D276F800389F1F /* MPToolbarDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3BD51416D276F800389F1F /* MPToolbarDelegate.m */; }; - 4C3D4C0817594CA40038DAAC /* HNHSeparator.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3D4C0717594CA40038DAAC /* HNHSeparator.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; + 4C3D4C0817594CA40038DAAC /* HNHSeparator.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3D4C0717594CA40038DAAC /* HNHSeparator.m */; }; 4C3E1CC0177DEFB3003BD9BD /* StringField+Undo.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3E1CBF177DEFB3003BD9BD /* StringField+Undo.m */; }; 4C3FFD9E16DAF60600DF9186 /* FilterBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C3FFD9D16DAF60600DF9186 /* FilterBar.xib */; }; 4C431BCD16E2A82800700A81 /* MPPasteBoardController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C431BCC16E2A82700700A81 /* MPPasteBoardController.m */; }; 4C431BCF16E2BAB000700A81 /* OverlayWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C431BCE16E2BAB000700A81 /* OverlayWindow.xib */; }; 4C46B88517063A070046109A /* NSString+MPPasswordCreation.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46B88417063A070046109A /* NSString+MPPasswordCreation.m */; }; 4C46B88817063A170046109A /* NSString+MPPasswordAnalysis.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46B88717063A170046109A /* NSString+MPPasswordAnalysis.m */; }; - 4C46E09E17673A0A00DA62E8 /* HNHShadowBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46E09D17673A0A00DA62E8 /* HNHShadowBox.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; + 4C46E09E17673A0A00DA62E8 /* HNHShadowBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46E09D17673A0A00DA62E8 /* HNHShadowBox.m */; }; 4C4A100F176286FD00BBF2CA /* MPTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4A100E176286FD00BBF2CA /* MPTableView.m */; }; 4C4A101217629DA900BBF2CA /* KdbGroup+KVOAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4A101117629DA900BBF2CA /* KdbGroup+KVOAdditions.m */; }; 4C4FCE15177CFE6B00BBF7AE /* MPCustomFieldTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4FCE14177CFE6B00BBF7AE /* MPCustomFieldTableCellView.m */; }; 4C4FCE18177D03D700BBF7AE /* Kdb4Entry+KVOAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4FCE17177D03D700BBF7AE /* Kdb4Entry+KVOAdditions.m */; }; - 4C52A244177D7B9F0000D88F /* HNHScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C52A243177D7B9F0000D88F /* HNHScrollView.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; + 4C52A244177D7B9F0000D88F /* HNHScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C52A243177D7B9F0000D88F /* HNHScrollView.m */; }; 4C569D9E17652B0600595B62 /* MPConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C569D9D17652B0600595B62 /* MPConstants.m */; }; 4C569DA117652BFE00595B62 /* MPEntryTableDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C569DA017652BFE00595B62 /* MPEntryTableDataSource.m */; }; 4C569DA417653F3500595B62 /* KdbEntry+MPTreeTools.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C569DA317653F3500595B62 /* KdbEntry+MPTreeTools.m */; }; 4C586F9E16D07ABD00E7DB57 /* 00_PasswordTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C586F9D16D07ABD00E7DB57 /* 00_PasswordTemplate.pdf */; }; 4C586FA016D07D7200E7DB57 /* 01_PackageNetworkTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C586F9F16D07D7200E7DB57 /* 01_PackageNetworkTemplate.pdf */; }; 4C586FA216D07F6A00E7DB57 /* 02_MessageBoxWarningTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C586FA116D07F6A00E7DB57 /* 02_MessageBoxWarningTemplate.pdf */; }; - 4C58BD4F176370B100B8178C /* HNHBadgedTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C58BD4E176370B100B8178C /* HNHBadgedTextField.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; + 4C58BD4F176370B100B8178C /* HNHBadgedTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C58BD4E176370B100B8178C /* HNHBadgedTextField.m */; }; 4C5A11FE1708DE8700223D8A /* MPPasswordCreatorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5A11FC1708DE8700223D8A /* MPPasswordCreatorViewController.m */; }; 4C5A11FF1708DE8800223D8A /* PasswordCreatorView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C5A11FD1708DE8700223D8A /* PasswordCreatorView.xib */; }; 4C5BF67B175C01F300D53DF7 /* MPUppercaseStringValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5BF67A175C01F300D53DF7 /* MPUppercaseStringValueTransformer.m */; }; @@ -116,7 +116,7 @@ 4C669B9F16760ED100DD0774 /* RandomStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7516760ED100DD0774 /* RandomStream.m */; }; 4C669BA016760ED100DD0774 /* Salsa20RandomStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7716760ED100DD0774 /* Salsa20RandomStream.m */; }; 4C669BA216760ED100DD0774 /* UUID.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7B16760ED100DD0774 /* UUID.m */; }; - 4C69A73A16D589DF00EC1B1A /* HNHGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C69A73916D589DF00EC1B1A /* HNHGradientView.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; + 4C69A73A16D589DF00EC1B1A /* HNHGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C69A73916D589DF00EC1B1A /* HNHGradientView.m */; }; 4C74DD07177BD1640034A9DB /* MPCustomFieldView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C74DD06177BD1640034A9DB /* MPCustomFieldView.m */; }; 4C76155C1764C04C0015A1A6 /* GeneralSettings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C76155E1764C04C0015A1A6 /* GeneralSettings.xib */; }; 4C7615631764C08C0015A1A6 /* PasswordEditView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C7615651764C08C0015A1A6 /* PasswordEditView.xib */; }; @@ -130,10 +130,10 @@ 4C77E37315B84A240093A587 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C77E37215B84A240093A587 /* main.m */; }; 4C77E37A15B84A240093A587 /* MPAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C77E37915B84A240093A587 /* MPAppDelegate.m */; }; 4C77E37D15B84A240093A587 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C77E37B15B84A240093A587 /* MainMenu.xib */; }; - 4C79DF2A176685870083708F /* HNHRoundedTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C79DF29176685870083708F /* HNHRoundedTextField.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; + 4C79DF2A176685870083708F /* HNHRoundedTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C79DF29176685870083708F /* HNHRoundedTextField.m */; }; 4C7E832A172DE2F2002493D8 /* MPPasswordEditViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C7E8329172DE2F2002493D8 /* MPPasswordEditViewController.m */; }; 4C7F35681779DFFB00C57890 /* Errors.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4C7F356A1779DFFB00C57890 /* Errors.strings */; }; - 4C80BB6F176DE06F00E5E248 /* HNHScrollDocumentViewAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C80BB6E176DE06F00E5E248 /* HNHScrollDocumentViewAdapter.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; + 4C80BB6F176DE06F00E5E248 /* HNHScrollDocumentViewAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C80BB6E176DE06F00E5E248 /* HNHScrollDocumentViewAdapter.m */; }; 4C811C8316ECD06E00C4BAC6 /* MPKeyfilePathControlDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C811C8216ECD06E00C4BAC6 /* MPKeyfilePathControlDelegate.m */; }; 4C83814215BF4677001AE468 /* MPDocumentWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C83814115BF4677001AE468 /* MPDocumentWindowController.m */; }; 4C83F4AA1774B155006C5FC0 /* Kdb3Tree+NewTree.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C83F4A91774B155006C5FC0 /* Kdb3Tree+NewTree.m */; }; @@ -143,29 +143,29 @@ 4C888C9716EB754B003D34A1 /* MPActionHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C888C9616EB754B003D34A1 /* MPActionHelper.m */; }; 4C8FECC816D57E3200BF26CF /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C8FECC716D57E3200BF26CF /* QuartzCore.framework */; }; 4C920E2A16DCDFA00083839B /* MPLoggerProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C920E2916DCDFA00083839B /* MPLoggerProxy.m */; }; - 4C9D6AA917615199001C660C /* HNHRoundedSecureTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C9D6AA817615199001C660C /* HNHRoundedSecureTextFieldCell.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; + 4C9D6AA917615199001C660C /* HNHRoundedSecureTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C9D6AA817615199001C660C /* HNHRoundedSecureTextFieldCell.m */; }; 4CA0B2ED15BCADAC00654E32 /* SettingsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */; }; 4CA0B2F915BCAF6700654E32 /* MPGeneralSettingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA0B2F815BCAF6700654E32 /* MPGeneralSettingsController.m */; }; 4CA0B2FC15BCAF8600654E32 /* MPSettingsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA0B2FB15BCAF8600654E32 /* MPSettingsWindowController.m */; }; 4CA0E3A7176FAF99004D18CB /* MPDocumentQueryService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA0E3A6176FAF99004D18CB /* MPDocumentQueryService.m */; }; 4CA2335A176DBFE100F0B6AC /* MPLockDaemon.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CA23359176DBFE100F0B6AC /* MPLockDaemon.m */; }; - 4CAD747B15B887FD00104512 /* DDXMLElementAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745715B887FD00104512 /* DDXMLElementAdditions.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4CAD747C15B887FD00104512 /* NSString+DDXML.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745A15B887FD00104512 /* NSString+DDXML.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4CAD747D15B887FD00104512 /* DDXMLDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745D15B887FD00104512 /* DDXMLDocument.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4CAD747E15B887FD00104512 /* DDXMLElement.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745F15B887FD00104512 /* DDXMLElement.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; - 4CAD747F15B887FD00104512 /* DDXMLNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD746115B887FD00104512 /* DDXMLNode.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; + 4CAD747B15B887FD00104512 /* DDXMLElementAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745715B887FD00104512 /* DDXMLElementAdditions.m */; }; + 4CAD747C15B887FD00104512 /* NSString+DDXML.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745A15B887FD00104512 /* NSString+DDXML.m */; }; + 4CAD747D15B887FD00104512 /* DDXMLDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745D15B887FD00104512 /* DDXMLDocument.m */; }; + 4CAD747E15B887FD00104512 /* DDXMLElement.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD745F15B887FD00104512 /* DDXMLElement.m */; }; + 4CAD747F15B887FD00104512 /* DDXMLNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAD746115B887FD00104512 /* DDXMLNode.m */; }; 4CAD748C15B889B700104512 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CAD748B15B889B700104512 /* Security.framework */; }; 4CAD748E15B88AC100104512 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CAD748D15B88AC100104512 /* libz.dylib */; }; - 4CAF62FC1763604000CD7084 /* HNHBadgedTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAF62FB1763604000CD7084 /* HNHBadgedTextFieldCell.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; + 4CAF62FC1763604000CD7084 /* HNHBadgedTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CAF62FB1763604000CD7084 /* HNHBadgedTextFieldCell.m */; }; 4CB9339916D3A0DD00A13B5D /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 4CB9339716D3A0DD00A13B5D /* Credits.rtf */; }; 4CBA2ABA17074C07006D8139 /* MPSettingsHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CBA2AB917074C07006D8139 /* MPSettingsHelper.m */; }; 4CC1AEBE16D4467C006D2AAB /* KdbTree+MPAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC1AEBD16D4467C006D2AAB /* KdbTree+MPAdditions.m */; }; 4CC299FF176F99E50050C939 /* MPRequestHandlerService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC299FE176F99E50050C939 /* MPRequestHandlerService.m */; }; 4CC29A02176F9D140050C939 /* MPTestAssociateRequestHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC29A01176F9D140050C939 /* MPTestAssociateRequestHandler.m */; }; - 4CC3AABD175F4983003EF01B /* HNHRoundedTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC3AAB9175F4983003EF01B /* HNHRoundedTextFieldCell.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; + 4CC3AABD175F4983003EF01B /* HNHRoundedTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC3AAB9175F4983003EF01B /* HNHRoundedTextFieldCell.m */; }; 4CC672791781D0C0006DEDCF /* KdbGroup+MPAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC672781781D0C0006DEDCF /* KdbGroup+MPAdditions.m */; }; 4CC6727C1781D0D2006DEDCF /* KdbEntry+MPAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC6727B1781D0D2006DEDCF /* KdbEntry+MPAdditions.m */; }; - 4CC7EA1B17807E7E0089D4F3 /* HNHRoundendTextFieldCellHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7EA1A17807E7E0089D4F3 /* HNHRoundendTextFieldCellHelper.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; + 4CC7EA1B17807E7E0089D4F3 /* HNHRoundendTextFieldCellHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7EA1A17807E7E0089D4F3 /* HNHRoundendTextFieldCellHelper.m */; }; 4CD5D702177A5EE400100649 /* DocumentSettingsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CD5D701177A5EE400100649 /* DocumentSettingsWindow.xib */; }; 4CD5D705177A5F3300100649 /* MPDocumentSettingsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD5D704177A5F3300100649 /* MPDocumentSettingsWindowController.m */; }; 4CD78ABC16D155FF00768A1D /* 07_NotepadTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4CD78AB716D155FF00768A1D /* 07_NotepadTemplate.pdf */; }; @@ -184,7 +184,7 @@ 4CF6C711176F4533007A811D /* MPStringLengthValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CF6C710176F4533007A811D /* MPStringLengthValueTransformer.m */; }; 4CF6C718176F5234007A811D /* MPAssociateRequestHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CF6C717176F5234007A811D /* MPAssociateRequestHandler.m */; }; 4CF78057176E5CFD0032EE71 /* MPConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CF78056176E5CFD0032EE71 /* MPConnection.m */; }; - 4CF7805A176E6D5F0032EE71 /* HNHTableRowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CF78059176E6D5F0032EE71 /* HNHTableRowView.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; + 4CF7805A176E6D5F0032EE71 /* HNHTableRowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CF78059176E6D5F0032EE71 /* HNHTableRowView.m */; }; 4CF7805D176E71170032EE71 /* MPServerDaemon.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CF7805C176E71170032EE71 /* MPServerDaemon.m */; }; 4CF7805F176E75110032EE71 /* ServerSettings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CF7805E176E75110032EE71 /* ServerSettings.xib */; }; 4CF78064176E75AD0032EE71 /* MPServerSettingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CF78063176E75AD0032EE71 /* MPServerSettingsController.m */; }; @@ -1655,6 +1655,7 @@ 4C77E38115B84A240093A587 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_ARC = YES; COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "MacPass/MacPass-Prefix.pch"; @@ -1668,6 +1669,7 @@ 4C77E38215B84A240093A587 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_ARC = YES; COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "MacPass/MacPass-Prefix.pch"; diff --git a/MacPass/Kdb3Tree+NewTree.m b/MacPass/Kdb3Tree+NewTree.m index b228d5aa..6d894775 100644 --- a/MacPass/Kdb3Tree+NewTree.m +++ b/MacPass/Kdb3Tree+NewTree.m @@ -47,9 +47,8 @@ group.image = 37; [parentGroup addGroup:group]; - [rootGroup release]; - return [tree autorelease]; + return tree; } @end diff --git a/MacPass/Kdb4Tree+NewTree.m b/MacPass/Kdb4Tree+NewTree.m index e227e03a..6eca4c3c 100644 --- a/MacPass/Kdb4Tree+NewTree.m +++ b/MacPass/Kdb4Tree+NewTree.m @@ -71,7 +71,7 @@ group.image = 37; [parentGroup addGroup:group]; - return [tree autorelease]; + return tree; } @end diff --git a/MacPass/MPActionHelper.m b/MacPass/MPActionHelper.m index c3ec5f6f..ab87bc88 100644 --- a/MacPass/MPActionHelper.m +++ b/MacPass/MPActionHelper.m @@ -14,7 +14,7 @@ static NSDictionary *actionDict; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ - actionDict = [@{ + actionDict = @{ @(MPActionAddEntry) : @"createEntry:", @(MPActionAddGroup) : @"createGroup:", @(MPActionCopyPassword) : @"copyPassword:", @@ -26,7 +26,7 @@ @(MPActionToggleInspector) : @"toggleInspector:", @(MPActionLock) : @"lock:", @(MPActionEmptyTrash) : @"emptyTrash:" - } retain]; + }; }); return NSSelectorFromString(actionDict[@(type)]); } diff --git a/MacPass/MPAppDelegate.h b/MacPass/MPAppDelegate.h index 751c6fec..5710e5a8 100644 --- a/MacPass/MPAppDelegate.h +++ b/MacPass/MPAppDelegate.h @@ -10,7 +10,7 @@ @interface MPAppDelegate : NSObject -@property (retain) IBOutlet NSWindow *passwordCreatorWindow; +@property (strong) IBOutlet NSWindow *passwordCreatorWindow; - (IBAction)showPasswordCreator:(id)sender; diff --git a/MacPass/MPAppDelegate.m b/MacPass/MPAppDelegate.m index 4757bde9..1b8731fa 100644 --- a/MacPass/MPAppDelegate.m +++ b/MacPass/MPAppDelegate.m @@ -23,8 +23,8 @@ MPLockDaemon *lockDaemon; } -@property (retain, nonatomic) MPSettingsWindowController *settingsController; -@property (retain, nonatomic) MPPasswordCreatorViewController *passwordCreatorController; +@property (strong, nonatomic) MPSettingsWindowController *settingsController; +@property (strong, nonatomic) MPPasswordCreatorViewController *passwordCreatorController; - (IBAction)showPreferences:(id)sender; @@ -47,14 +47,6 @@ lockDaemon = [[MPLockDaemon alloc] init]; } -- (void)dealloc { - [_settingsController release]; - [_passwordCreatorController release]; - [_passwordCreatorWindow release]; - [serverDaemon release]; - [lockDaemon release]; - [super dealloc]; -} - (NSString *)applicationName { return [[NSBundle mainBundle] infoDictionary][@"CFBundleName"]; @@ -63,7 +55,7 @@ #pragma mark Menu Actions - (void)showPreferences:(id)sender { if(self.settingsController == nil) { - self.settingsController = [[[MPSettingsWindowController alloc] init] autorelease]; + self.settingsController = [[MPSettingsWindowController alloc] init]; } [self.settingsController showSettings]; } @@ -73,7 +65,7 @@ [[NSBundle mainBundle] loadNibNamed:@"PasswordCreatorWindow"owner:self topLevelObjects:nil]; } if(!self.passwordCreatorController) { - self.passwordCreatorController = [[[MPPasswordCreatorViewController alloc] init] autorelease]; + self.passwordCreatorController = [[MPPasswordCreatorViewController alloc] init]; NSView *creatorView = [_passwordCreatorController view]; //NSView *contentView = [_passwordCreatorWindow contentView]; [self.passwordCreatorWindow setContentView:creatorView]; diff --git a/MacPass/MPContextMenuHelper.m b/MacPass/MPContextMenuHelper.m index 0fdcc146..3dd0bd61 100644 --- a/MacPass/MPContextMenuHelper.m +++ b/MacPass/MPContextMenuHelper.m @@ -28,8 +28,6 @@ keyEquivalent:@"E"]; [items addObjectsFromArray:@[ newGroup, newEntry ]]; - [newEntry release]; - [newGroup release]; } if(insertDelete || insertTrash) { [self _beginSection:items]; @@ -38,7 +36,6 @@ action:[MPActionHelper actionOfType:MPActionDelete] keyEquivalent:@""]; [items addObject:delete]; - [delete release]; } if(insertTrash) { @@ -49,7 +46,6 @@ unichar backSpace = NSBackspaceCharacter; [emptyTrash setKeyEquivalent:[NSString stringWithCharacters:&backSpace length:1]]; [items addObject:emptyTrash]; - [emptyTrash release]; } } @@ -67,7 +63,6 @@ action:0 keyEquivalent:@""]; [urlItem setSubmenu:urlMenu]; - [urlMenu release]; NSMenuItem *copyURL = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"COPY_URL", @"") action:[MPActionHelper actionOfType:MPActionCopyURL] @@ -77,13 +72,8 @@ keyEquivalent:@"U"]; [urlMenu addItem:copyURL]; [urlMenu addItem:openURL]; - [openURL release]; - [copyURL release]; [items addObjectsFromArray:@[ copyUsername, copyPassword, urlItem]]; - [urlItem release]; - [copyPassword release]; - [copyUsername release]; } return items; diff --git a/MacPass/MPCustomFieldTableCellView.h b/MacPass/MPCustomFieldTableCellView.h index 97b3c876..536426e5 100644 --- a/MacPass/MPCustomFieldTableCellView.h +++ b/MacPass/MPCustomFieldTableCellView.h @@ -10,8 +10,8 @@ @interface MPCustomFieldTableCellView : NSTableCellView -@property (assign) IBOutlet NSTextField *labelTextField; -@property (assign) IBOutlet NSTextField *valueTextField; -@property (assign) IBOutlet NSButton *removeButton; +@property (weak) IBOutlet NSTextField *labelTextField; +@property (weak) IBOutlet NSTextField *valueTextField; +@property (weak) IBOutlet NSButton *removeButton; @end diff --git a/MacPass/MPCustomFieldView.h b/MacPass/MPCustomFieldView.h index 10889570..485c836b 100644 --- a/MacPass/MPCustomFieldView.h +++ b/MacPass/MPCustomFieldView.h @@ -10,8 +10,8 @@ @interface MPCustomFieldView : NSView -@property (assign) IBOutlet NSTextField *labelTextField; -@property (assign) IBOutlet NSTextField *valueTextField; -@property (assign) IBOutlet NSButton *deleteButton; +@property (weak) IBOutlet NSTextField *labelTextField; +@property (weak) IBOutlet NSTextField *valueTextField; +@property (weak) IBOutlet NSButton *deleteButton; @end diff --git a/MacPass/MPDocument.h b/MacPass/MPDocument.h index f57e64e0..a95422a2 100644 --- a/MacPass/MPDocument.h +++ b/MacPass/MPDocument.h @@ -39,11 +39,11 @@ APPKIT_EXTERN NSString *const MPDocumentGroupKey; @property (assign, getter = isLocked) BOOL locked; /* true, if document is loaded and decrypted (tree is loaded) */ @property (assign, readonly, getter = isDecrypted) BOOL decrypted; -@property (retain, readonly, nonatomic) KdbTree *tree; -@property (assign, readonly, nonatomic) KdbGroup *root; -@property (readonly, retain) MPRootAdapter *rootAdapter; -@property (nonatomic, retain) NSString *password; -@property (nonatomic, retain) NSURL *key; +@property (strong, readonly, nonatomic) KdbTree *tree; +@property (weak, readonly, nonatomic) KdbGroup *root; +@property (readonly, strong) MPRootAdapter *rootAdapter; +@property (nonatomic, strong) NSString *password; +@property (nonatomic, strong) NSURL *key; @property (assign, readonly) MPDatabaseVersion version; @property (assign, readonly, getter = isReadOnly) BOOL readOnly; diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m index fc008f99..d2bcb7ae 100644 --- a/MacPass/MPDocument.m +++ b/MacPass/MPDocument.m @@ -43,19 +43,19 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey"; } -@property (retain, nonatomic) KdbTree *tree; -@property (assign, nonatomic) KdbGroup *root; -@property (nonatomic, readonly) KdbPassword *passwordHash; +@property (strong, nonatomic) KdbTree *tree; +@property (weak, nonatomic) KdbGroup *root; +@property (weak, nonatomic, readonly) KdbPassword *passwordHash; @property (assign) MPDatabaseVersion version; @property (assign, nonatomic) BOOL secured; @property (assign) BOOL decrypted; @property (assign) BOOL readOnly; -@property (retain) NSURL *lockFileURL; +@property (strong) NSURL *lockFileURL; @property (readonly) BOOL useTrash; -@property (readonly) KdbGroup *trash; +@property (weak, readonly) KdbGroup *trash; @end @@ -85,7 +85,7 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey"; self.tree = [Kdb4Tree templateTree]; break; default: - [self release]; + self = nil; return nil; } } @@ -94,18 +94,11 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey"; - (void)dealloc { [self _cleanupLock]; - [_tree release]; - [_password release]; - [_key release]; - [_lockFileURL release]; - [_rootAdapter release]; - [super dealloc]; } - (void)makeWindowControllers { MPDocumentWindowController *windowController = [[MPDocumentWindowController alloc] init]; [self addWindowController:windowController]; - [windowController release]; } - (void)windowControllerDidLoadNib:(NSWindowController *)aController @@ -179,23 +172,21 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey"; - (void)setPassword:(NSString *)password { if(![_password isEqualToString:password]) { - [_password release]; - _password = [password retain]; + _password = password; _secured |= ([_password length] > 0); } } - (void)setKey:(NSURL *)key { if(![[_key absoluteString] isEqualToString:[key absoluteString]]) { - [_key release]; - _key = [key retain]; + _key = key; _secured |= (_key != nil); } } - (KdbPassword *)passwordHash { - return [[[KdbPassword alloc] initWithPassword:self.password passwordEncoding:NSUTF8StringEncoding keyFileURL:self.key] autorelease]; + return [[KdbPassword alloc] initWithPassword:self.password passwordEncoding:NSUTF8StringEncoding keyFileURL:self.key]; } + (BOOL)autosavesInPlace @@ -206,8 +197,7 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGroupKey"; #pragma mark Data Accesors - (void)setTree:(KdbTree *)tree { if(_tree != tree) { - [_tree release]; - _tree = [tree retain]; + _tree = tree; self.rootAdapter.tree = _tree; } } diff --git a/MacPass/MPDocumentQueryService.m b/MacPass/MPDocumentQueryService.m index 8fdf613a..a8df778e 100644 --- a/MacPass/MPDocumentQueryService.m +++ b/MacPass/MPDocumentQueryService.m @@ -41,11 +41,6 @@ return self; } -- (void)dealloc -{ - [rootUuid release]; - [super dealloc]; -} - (KdbEntry *)configurationEntry { /* diff --git a/MacPass/MPDocumentSettingsWindowController.h b/MacPass/MPDocumentSettingsWindowController.h index a9aba5d9..d70a44fa 100644 --- a/MacPass/MPDocumentSettingsWindowController.h +++ b/MacPass/MPDocumentSettingsWindowController.h @@ -13,28 +13,28 @@ @interface MPDocumentSettingsWindowController : NSWindowController -@property (assign) IBOutlet NSTabView *sectionTabView; +@property (weak) IBOutlet NSTabView *sectionTabView; /* General Tab */ -@property (assign) IBOutlet NSTextField *databaseNameTextField; -@property (assign) IBOutlet NSTextView *databaseDescriptionTextView; +@property (weak) IBOutlet NSTextField *databaseNameTextField; +@property (unsafe_unretained) IBOutlet NSTextView *databaseDescriptionTextView; /* Protection */ -@property (assign) IBOutlet NSTextField *passwordTextField; -@property (assign) IBOutlet NSPathControl *keyfilePathControl; +@property (weak) IBOutlet NSTextField *passwordTextField; +@property (weak) IBOutlet NSPathControl *keyfilePathControl; /* Display Tab */ -@property (assign) IBOutlet NSButton *protectTitleCheckButton; -@property (assign) IBOutlet NSButton *protectUserNameCheckButton; -@property (assign) IBOutlet NSButton *protectPasswortCheckButton; -@property (assign) IBOutlet NSButton *protectURLCheckButton; -@property (assign) IBOutlet NSButton *protectNotesCheckButton; +@property (weak) IBOutlet NSButton *protectTitleCheckButton; +@property (weak) IBOutlet NSButton *protectUserNameCheckButton; +@property (weak) IBOutlet NSButton *protectPasswortCheckButton; +@property (weak) IBOutlet NSButton *protectURLCheckButton; +@property (weak) IBOutlet NSButton *protectNotesCheckButton; /* Advanced Tab*/ -@property (assign) IBOutlet NSButton *enableRecycleBinCheckButton; -@property (assign) IBOutlet NSButton *emptyRecycleBinOnQuitCheckButton; -@property (assign) IBOutlet NSPopUpButton *selectRecycleBinGroupPopUpButton; +@property (weak) IBOutlet NSButton *enableRecycleBinCheckButton; +@property (weak) IBOutlet NSButton *emptyRecycleBinOnQuitCheckButton; +@property (weak) IBOutlet NSPopUpButton *selectRecycleBinGroupPopUpButton; - (id)initWithDocument:(MPDocument *)document; - (void)update; diff --git a/MacPass/MPDocumentSettingsWindowController.m b/MacPass/MPDocumentSettingsWindowController.m index 95b58603..5c2ed703 100644 --- a/MacPass/MPDocumentSettingsWindowController.m +++ b/MacPass/MPDocumentSettingsWindowController.m @@ -117,14 +117,12 @@ [groupItem setState:NSOnState]; } [menu addItem:groupItem]; - [groupItem release]; } NSMenuItem *selectItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"SELECT_RECYCLEBIN", @"Menu item if no reycleBin is selected") action:NULL keyEquivalent:@""]; [selectItem setAction:@selector(_didSelectTrashFolder:)]; [selectItem setTarget:self]; [menu insertItem:selectItem atIndex:0]; - [selectItem release]; - return [menu autorelease]; + return menu; } @end diff --git a/MacPass/MPDocumentWindowController.h b/MacPass/MPDocumentWindowController.h index 65d8f1e5..32e86de2 100644 --- a/MacPass/MPDocumentWindowController.h +++ b/MacPass/MPDocumentWindowController.h @@ -22,17 +22,17 @@ APPKIT_EXTERN NSString *const MPCurrentItemChangedNotification; @interface MPDocumentWindowController : NSWindowController -@property (readonly, retain) MPPasswordInputController *passwordInputController; -@property (readonly, retain) MPPasswordEditViewController *passwordEditController; -@property (readonly, retain) MPEntryViewController *entryViewController; -@property (readonly, retain) MPOutlineViewController *outlineViewController; -@property (readonly, retain) MPInspectorViewController *inspectorViewController; +@property (readonly, strong) MPPasswordInputController *passwordInputController; +@property (readonly, strong) MPPasswordEditViewController *passwordEditController; +@property (readonly, strong) MPEntryViewController *entryViewController; +@property (readonly, strong) MPOutlineViewController *outlineViewController; +@property (readonly, strong) MPInspectorViewController *inspectorViewController; /* Holds the current item. That is either a KdbGroup or a KdbEntry */ -@property (readonly, assign) id currentItem; -@property (readonly, assign) KdbGroup *currentGroup; -@property (readonly, assign) KdbEntry *currentEntry; +@property (readonly, unsafe_unretained) id currentItem; +@property (readonly, unsafe_unretained) KdbGroup *currentGroup; +@property (readonly, unsafe_unretained) KdbEntry *currentEntry; - (void)showEntries; diff --git a/MacPass/MPDocumentWindowController.m b/MacPass/MPDocumentWindowController.m index 8f8ad56f..6870c26d 100644 --- a/MacPass/MPDocumentWindowController.m +++ b/MacPass/MPDocumentWindowController.m @@ -26,21 +26,21 @@ NSString *const MPCurrentItemChangedNotification = @"com.hicknhack.macpass.MPCur id _firstResponder; } -@property (retain) IBOutlet NSSplitView *splitView; +@property (strong) IBOutlet NSSplitView *splitView; -@property (retain) NSToolbar *toolbar; -@property (assign) id currentItem; -@property (assign) KdbGroup *currentGroup; -@property (assign) KdbEntry *currentEntry; +@property (strong) NSToolbar *toolbar; +@property (unsafe_unretained) id currentItem; +@property (unsafe_unretained) KdbGroup *currentGroup; +@property (unsafe_unretained) KdbEntry *currentEntry; -@property (retain) MPPasswordInputController *passwordInputController; -@property (retain) MPPasswordEditViewController *passwordEditController; -@property (retain) MPEntryViewController *entryViewController; -@property (retain) MPOutlineViewController *outlineViewController; -@property (retain) MPInspectorViewController *inspectorViewController; -@property (retain) MPDocumentSettingsWindowController *documentSettingsWindowController; +@property (strong) MPPasswordInputController *passwordInputController; +@property (strong) MPPasswordEditViewController *passwordEditController; +@property (strong) MPEntryViewController *entryViewController; +@property (strong) MPOutlineViewController *outlineViewController; +@property (strong) MPInspectorViewController *inspectorViewController; +@property (strong) MPDocumentSettingsWindowController *documentSettingsWindowController; -@property (retain) MPToolbarDelegate *toolbarDelegate; +@property (strong) MPToolbarDelegate *toolbarDelegate; @end @@ -66,17 +66,8 @@ NSString *const MPCurrentItemChangedNotification = @"com.hicknhack.macpass.MPCur - (void)dealloc { [[NSNotificationCenter defaultCenter] removeObserver:self]; - [_toolbar release]; - [_passwordInputController release]; - [_passwordEditController release]; - [_entryViewController release]; - [_outlineViewController release]; - [_inspectorViewController release]; - [_toolbarDelegate release]; - [_splitView release]; - [super dealloc]; } #pragma mark View Handling @@ -207,7 +198,7 @@ NSString *const MPCurrentItemChangedNotification = @"com.hicknhack.macpass.MPCur - (void)showPasswordInput { if(!self.passwordInputController) { - self.passwordInputController = [[[MPPasswordInputController alloc] init] autorelease]; + self.passwordInputController = [[MPPasswordInputController alloc] init]; } [self _setContentViewController:self.passwordInputController]; [self.passwordInputController requestPassword]; diff --git a/MacPass/MPEntryTableDataSource.h b/MacPass/MPEntryTableDataSource.h index 817c814c..6855c4cd 100644 --- a/MacPass/MPEntryTableDataSource.h +++ b/MacPass/MPEntryTableDataSource.h @@ -11,6 +11,6 @@ @class MPEntryViewController; @interface MPEntryTableDataSource : NSObject -@property (assign, nonatomic) MPEntryViewController *viewController; +@property (weak, nonatomic) MPEntryViewController *viewController; @end diff --git a/MacPass/MPEntryTableDataSource.m b/MacPass/MPEntryTableDataSource.m index 09ed6610..7efab818 100644 --- a/MacPass/MPEntryTableDataSource.m +++ b/MacPass/MPEntryTableDataSource.m @@ -32,7 +32,6 @@ NSPasteboardItem *pBoardItem = [[NSPasteboardItem alloc] init]; [pBoardItem setString:[uuid description] forType:MPPasteBoardType]; [pboard writeObjects:@[pBoardItem]]; - [pBoardItem release]; return YES; } diff --git a/MacPass/MPEntryViewController.h b/MacPass/MPEntryViewController.h index 612934bf..50230d25 100644 --- a/MacPass/MPEntryViewController.h +++ b/MacPass/MPEntryViewController.h @@ -31,11 +31,11 @@ typedef NS_ENUM( NSUInteger, MPCopyContentTypeTag) { @interface MPEntryViewController : MPViewController -@property (readonly, assign, nonatomic) KdbEntry *selectedEntry; +@property (readonly, weak, nonatomic) KdbEntry *selectedEntry; -@property (assign,readonly) NSTableView *entryTable; -@property (readonly, retain) NSArrayController *entryArrayController; -@property (nonatomic, retain) NSString *filter; +@property (weak,readonly) NSTableView *entryTable; +@property (readonly, strong) NSArrayController *entryArrayController; +@property (nonatomic, strong) NSString *filter; /* Call this after alle viewcontroller are loaded */ diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m index 6d21784d..a1fa26d9 100644 --- a/MacPass/MPEntryViewController.m +++ b/MacPass/MPEntryViewController.m @@ -61,27 +61,27 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername"; @interface MPEntryViewController () -@property (retain) NSArrayController *entryArrayController; -@property (retain) NSArray *filteredEntries; -@property (retain) IBOutlet NSView *filterBar; -@property (assign) IBOutlet NSTableView *entryTable; -@property (retain) IBOutlet NSLayoutConstraint *tableToTop; -@property (assign) IBOutlet NSButton *filterDoneButton; +@property (strong) NSArrayController *entryArrayController; +@property (strong) NSArray *filteredEntries; +@property (strong) IBOutlet NSView *filterBar; +@property (weak) IBOutlet NSTableView *entryTable; +@property (strong) IBOutlet NSLayoutConstraint *tableToTop; +@property (weak) IBOutlet NSButton *filterDoneButton; -@property (assign) IBOutlet NSButton *filterTitleButton; -@property (assign) IBOutlet NSButton *filterUsernameButton; -@property (assign) IBOutlet NSButton *filterURLButton; -@property (assign) IBOutlet NSTextField *filterLabelTextField; -@property (assign) IBOutlet NSSearchField *filterSearchField; -@property (assign) IBOutlet HNHGradientView *bottomBar; -@property (assign) IBOutlet NSButton *addEntryButton; +@property (weak) IBOutlet NSButton *filterTitleButton; +@property (weak) IBOutlet NSButton *filterUsernameButton; +@property (weak) IBOutlet NSButton *filterURLButton; +@property (weak) IBOutlet NSTextField *filterLabelTextField; +@property (weak) IBOutlet NSSearchField *filterSearchField; +@property (weak) IBOutlet HNHGradientView *bottomBar; +@property (weak) IBOutlet NSButton *addEntryButton; -@property (assign) KdbEntry *selectedEntry; +@property (weak) KdbEntry *selectedEntry; -@property (nonatomic, retain) MPEntryTableDataSource *dataSource; +@property (nonatomic, strong) MPEntryTableDataSource *dataSource; @property (assign, nonatomic) MPFilterModeType filterMode; -@property (retain, nonatomic) NSDictionary *filterButtonToMode; +@property (strong, nonatomic) NSDictionary *filterButtonToMode; @end @@ -96,10 +96,10 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername"; self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; if(self) { _filterMode = MPFilterTitles; - _filterButtonToMode = [@{ _toggleFilterUsernameButton : @(MPFilterUsernames), + _filterButtonToMode = @{ _toggleFilterUsernameButton : @(MPFilterUsernames), _toggleFilterTitleButton : @(MPFilterTitles), _toggleFilterURLButton : @(MPFilterUrls) - } retain]; + }; _entryArrayController = [[NSArrayController alloc] init]; _dataSource = [[MPEntryTableDataSource alloc] init]; _dataSource.viewController = self; @@ -111,14 +111,6 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername"; - (void)dealloc { [[NSNotificationCenter defaultCenter] removeObserver:self]; - [_entryArrayController release]; - [_filteredEntries release]; - [_filter release]; - [_filterBar release]; - [_tableToTop release]; - [_dataSource release]; - [_filterButtonToMode release]; - [super dealloc]; } - (void)didLoadView { @@ -273,8 +265,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername"; - (void)setFilter:(NSString *)filter { if(_filter != filter) { - [_filter release]; - _filter = [filter retain]; + _filter = filter; [self updateFilter]; } } @@ -437,7 +428,6 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername"; [menu addItem:item]; } [self.entryTable setMenu:menu]; - [menu release]; } #pragma makr Action Helper diff --git a/MacPass/MPGeneralSettingsController.h b/MacPass/MPGeneralSettingsController.h index 137477c5..777e6cf0 100644 --- a/MacPass/MPGeneralSettingsController.h +++ b/MacPass/MPGeneralSettingsController.h @@ -12,9 +12,9 @@ @interface MPGeneralSettingsController : MPViewController -@property (assign) IBOutlet NSButton *clearPasteboardOnQuitCheckButton; -@property (assign) IBOutlet NSPopUpButton *clearPasteboardTimeoutPopup; -@property (assign) IBOutlet NSPopUpButton *idleTimeOutPopup; -@property (assign) IBOutlet NSButton *lockOnSleepCheckButton; +@property (weak) IBOutlet NSButton *clearPasteboardOnQuitCheckButton; +@property (weak) IBOutlet NSPopUpButton *clearPasteboardTimeoutPopup; +@property (weak) IBOutlet NSPopUpButton *idleTimeOutPopup; +@property (weak) IBOutlet NSButton *lockOnSleepCheckButton; @end diff --git a/MacPass/MPIconHelper.m b/MacPass/MPIconHelper.m index 456bd07b..5f71b036 100644 --- a/MacPass/MPIconHelper.m +++ b/MacPass/MPIconHelper.m @@ -26,7 +26,7 @@ MPIconType iconType = (MPIconType)[iconNumber integerValue]; [icons addObject:[MPIconHelper icon:iconType]]; } - return [icons autorelease]; + return icons; } + (NSDictionary *)availableIconNames { diff --git a/MacPass/MPIconSelectViewController.h b/MacPass/MPIconSelectViewController.h index ecbc0888..bbde1223 100644 --- a/MacPass/MPIconSelectViewController.h +++ b/MacPass/MPIconSelectViewController.h @@ -10,7 +10,7 @@ @interface MPIconSelectViewController : MPViewController -@property (assign) IBOutlet NSCollectionView *iconCollectionView; +@property (weak) IBOutlet NSCollectionView *iconCollectionView; - (IBAction)useDefault:(id)sender; @end diff --git a/MacPass/MPIconSelectViewController.m b/MacPass/MPIconSelectViewController.m index 876bf9ab..336d1d18 100644 --- a/MacPass/MPIconSelectViewController.m +++ b/MacPass/MPIconSelectViewController.m @@ -36,10 +36,5 @@ } - (IBAction)useDefault:(id)sender { - SEL hidePopup = @selector(hideImagePopup:); - id target = [[NSApplication sharedApplication] targetForAction:hidePopup to:nil from:self]; - if( target ) { - [target performSelector:hidePopup withObject:self]; - } } @end diff --git a/MacPass/MPInspectorViewController.h b/MacPass/MPInspectorViewController.h index 9a3b3713..33215c5b 100644 --- a/MacPass/MPInspectorViewController.h +++ b/MacPass/MPInspectorViewController.h @@ -16,22 +16,22 @@ @interface MPInspectorViewController : MPViewController -@property (assign) IBOutlet MPPopupImageView *itemImageView; -@property (assign) IBOutlet NSTextField *itemNameTextfield; +@property (weak) IBOutlet MPPopupImageView *itemImageView; +@property (weak) IBOutlet NSTextField *itemNameTextfield; -@property (assign) IBOutlet NSTextField *titleTextField; -@property (assign) IBOutlet NSTextField *usernameTextField; -@property (assign) IBOutlet NSTextField *URLTextField; -@property (assign) IBOutlet NSTextField *passwordTextField; -@property (assign) IBOutlet NSTextField *titleOrNameLabel; -@property (assign) IBOutlet HNHGradientView *bottomBar; -@property (assign) IBOutlet NSTextField *createdTextField; -@property (assign) IBOutlet NSTextField *modifiedTextField; -@property (assign) IBOutlet NSSegmentedControl *infoTabControl; -@property (assign) IBOutlet NSTableView *attachmentTableView; -@property (assign) IBOutlet NSTableView *customFieldsTableView; -@property (assign) IBOutlet NSTextView *notesTextView; -@property (assign) IBOutlet NSTextField *customFieldsTextField; +@property (weak) IBOutlet NSTextField *titleTextField; +@property (weak) IBOutlet NSTextField *usernameTextField; +@property (weak) IBOutlet NSTextField *URLTextField; +@property (weak) IBOutlet NSTextField *passwordTextField; +@property (weak) IBOutlet NSTextField *titleOrNameLabel; +@property (weak) IBOutlet HNHGradientView *bottomBar; +@property (weak) IBOutlet NSTextField *createdTextField; +@property (weak) IBOutlet NSTextField *modifiedTextField; +@property (weak) IBOutlet NSSegmentedControl *infoTabControl; +@property (weak) IBOutlet NSTableView *attachmentTableView; +@property (weak) IBOutlet NSTableView *customFieldsTableView; +@property (unsafe_unretained) IBOutlet NSTextView *notesTextView; +@property (weak) IBOutlet NSTextField *customFieldsTextField; /* Seperate call to ensure alle registered objects are in place */ diff --git a/MacPass/MPInspectorViewController.m b/MacPass/MPInspectorViewController.m index 3f524c6f..e0fff8b5 100644 --- a/MacPass/MPInspectorViewController.m +++ b/MacPass/MPInspectorViewController.m @@ -42,19 +42,19 @@ enum { BOOL _visible; } -@property (assign, nonatomic) KdbEntry *selectedEntry; -@property (assign, nonatomic) KdbGroup *selectedGroup; +@property (weak, nonatomic) KdbEntry *selectedEntry; +@property (weak, nonatomic) KdbGroup *selectedGroup; -@property (retain) NSPopover *activePopover; -@property (assign) IBOutlet NSButton *generatePasswordButton; +@property (strong) NSPopover *activePopover; +@property (weak) IBOutlet NSButton *generatePasswordButton; -@property (nonatomic, assign) NSDate *modificationDate; -@property (nonatomic, assign) NSDate *creationDate; +@property (nonatomic, weak) NSDate *modificationDate; +@property (nonatomic, weak) NSDate *creationDate; @property (nonatomic, assign) NSUInteger activeTab; -@property (assign) IBOutlet NSTabView *tabView; -@property (retain) NSArrayController *attachmentsController; -@property (retain) NSArrayController *customFieldsController; +@property (weak) IBOutlet NSTabView *tabView; +@property (strong) NSArrayController *attachmentsController; +@property (strong) NSArrayController *customFieldsController; - (IBAction)addCustomField:(id)sender; - (IBAction)removeCustomField:(id)sender; @@ -81,10 +81,6 @@ enum { - (void)dealloc { [[NSNotificationCenter defaultCenter] removeObserver:self]; - [_activePopover release]; - [_attachmentsController release]; - [_customFieldsController release]; - [super dealloc]; } - (void)didLoadView { @@ -267,12 +263,12 @@ enum { #pragma mark Popovers - (void)_showImagePopup:(id)sender { - [self _showPopopver:[[[MPIconSelectViewController alloc] init] autorelease] atView:self.itemImageView onEdge:NSMinYEdge]; + [self _showPopopver:[[MPIconSelectViewController alloc] init] atView:self.itemImageView onEdge:NSMinYEdge]; } - (IBAction)_popUpPasswordGenerator:(id)sender { [self.generatePasswordButton setEnabled:NO]; - [self _showPopopver:[[[MPPasswordCreatorViewController alloc] init] autorelease] atView:self.passwordTextField onEdge:NSMinYEdge]; + [self _showPopopver:[[MPPasswordCreatorViewController alloc] init] atView:self.passwordTextField onEdge:NSMinYEdge]; } - (void)_showPopopver:(NSViewController *)viewController atView:(NSView *)view onEdge:(NSRectEdge)edge { @@ -302,7 +298,6 @@ enum { } /* TODO: Check for Icon wizzard */ - [_activePopover release]; _activePopover = nil; } diff --git a/MacPass/MPLockDaemon.m b/MacPass/MPLockDaemon.m index fd65b82a..dd4ea41c 100644 --- a/MacPass/MPLockDaemon.m +++ b/MacPass/MPLockDaemon.m @@ -51,9 +51,7 @@ NSString *const MPShouldLockDatabaseNotification = @"com.hicknhack.macpass.MPSho /* Timer */ [idleCheckTimer invalidate]; - [idleCheckTimer release]; - [super dealloc]; } - (void)setLockOnSleep:(BOOL)lockOnSleep { @@ -74,7 +72,6 @@ NSString *const MPShouldLockDatabaseNotification = @"com.hicknhack.macpass.MPSho _idleLockTime = idleLockTime; if(_idleLockTime == 0) { [idleCheckTimer invalidate]; - [idleCheckTimer release]; idleCheckTimer = nil; } else { @@ -84,7 +81,7 @@ NSString *const MPShouldLockDatabaseNotification = @"com.hicknhack.macpass.MPSho return; // Done } /* Create new timer and schedule it with runloop */ - idleCheckTimer = [[NSTimer timerWithTimeInterval:_idleLockTime target:self selector:@selector(_checkIdleTime:) userInfo:nil repeats:YES] retain]; + idleCheckTimer = [NSTimer timerWithTimeInterval:_idleLockTime target:self selector:@selector(_checkIdleTime:) userInfo:nil repeats:YES]; [[NSRunLoop mainRunLoop] addTimer:idleCheckTimer forMode:NSDefaultRunLoopMode]; } } diff --git a/MacPass/MPLoggerProxy.h b/MacPass/MPLoggerProxy.h index e24ebc1d..9f511597 100644 --- a/MacPass/MPLoggerProxy.h +++ b/MacPass/MPLoggerProxy.h @@ -9,7 +9,7 @@ #import @interface MPLoggerProxy : NSObject -@property (retain) id original; +@property (strong) id original; - (id)initWithOriginal:(id) value; diff --git a/MacPass/MPOutlineDataSource.m b/MacPass/MPOutlineDataSource.m index 0636d780..0e99fb45 100644 --- a/MacPass/MPOutlineDataSource.m +++ b/MacPass/MPOutlineDataSource.m @@ -23,11 +23,10 @@ - (BOOL)outlineView:(NSOutlineView *)outlineView writeItems:(NSArray *)items toPasteboard:(NSPasteboard *)pasteboard { - [_draggedItem release]; _draggedItem = nil; [pasteboard setString:@"Weee" forType:MPPasteBoardType]; if([items count] == 1) { - _draggedItem = [[[items lastObject] representedObject] retain]; + _draggedItem = [[items lastObject] representedObject]; return (nil != _draggedItem.parent); } return YES; @@ -93,7 +92,6 @@ MPDocument *document = [[[outlineView window] windowController] document]; KdbGroup *rootGroup = [document root]; KdbEntry *draggedEntry = [rootGroup entryForUUID:uuid]; - [uuid release]; if(draggedEntry) { if(draggedEntry.parent != target && index == NSOutlineViewDropOnItemIndex) { [document moveEntry:draggedEntry toGroup:target index:index]; diff --git a/MacPass/MPOutlineViewController.h b/MacPass/MPOutlineViewController.h index 6b4ba88e..197abc4a 100644 --- a/MacPass/MPOutlineViewController.h +++ b/MacPass/MPOutlineViewController.h @@ -17,9 +17,9 @@ APPKIT_EXTERN NSString *const MPOutlineViewDidChangeGroupSelection; @interface MPOutlineViewController : MPViewController -@property (readonly, assign) NSOutlineView *outlineView; -@property (assign) IBOutlet HNHGradientView *bottomBar; -@property (assign, readonly) KdbGroup *selectedGroup; +@property (readonly, weak) NSOutlineView *outlineView; +@property (weak) IBOutlet HNHGradientView *bottomBar; +@property (weak, readonly) KdbGroup *selectedGroup; - (void)clearSelection; - (void)showOutline; diff --git a/MacPass/MPOutlineViewController.m b/MacPass/MPOutlineViewController.m index d7478f10..09049d31 100644 --- a/MacPass/MPOutlineViewController.m +++ b/MacPass/MPOutlineViewController.m @@ -9,6 +9,7 @@ #import "MPOutlineViewController.h" #import "MPOutlineDataSource.h" #import "MPDocument.h" +#import "MPDocumentWindowController.h" #import "MPContextMenuHelper.h" #import "MPConstants.h" #import "MPActionHelper.h" @@ -30,13 +31,13 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell"; @interface MPOutlineViewController () { BOOL _bindingEstablished; } -@property (assign) IBOutlet NSOutlineView *outlineView; -@property (assign) IBOutlet NSButton *addGroupButton; -@property (assign) KdbGroup *selectedGroup; +@property (weak) IBOutlet NSOutlineView *outlineView; +@property (weak) IBOutlet NSButton *addGroupButton; +@property (weak) KdbGroup *selectedGroup; -@property (retain) NSTreeController *treeController; -@property (retain) MPOutlineDataSource *datasource; -@property (retain) NSMenu *menu; +@property (strong) NSTreeController *treeController; +@property (strong) MPOutlineDataSource *datasource; +@property (strong) NSMenu *menu; @end @@ -57,12 +58,6 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell"; return self; } -- (void)dealloc { - [_treeController release]; - [_datasource release]; - [_menu release]; - [super dealloc]; -} - (void)didLoadView { [_outlineView setDelegate:self]; @@ -196,7 +191,7 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell"; for(NSMenuItem *item in items) { [menu addItem:item]; } - return [menu autorelease]; + return menu; } - (BOOL)_itemIsRootNodeAdapter:(id)item { diff --git a/MacPass/MPOverlayWindowController.m b/MacPass/MPOverlayWindowController.m index cfda71db..0badf80e 100644 --- a/MacPass/MPOverlayWindowController.m +++ b/MacPass/MPOverlayWindowController.m @@ -12,8 +12,8 @@ @interface MPOverlayWindowController () @property (assign) BOOL isAnimating; -@property (assign) IBOutlet NSImageView *imageView; -@property (assign) IBOutlet NSTextField *textField; +@property (weak) IBOutlet NSImageView *imageView; +@property (weak) IBOutlet NSTextField *textField; @end diff --git a/MacPass/MPPasswordCreatorViewController.h b/MacPass/MPPasswordCreatorViewController.h index 2d236716..03dd8b74 100644 --- a/MacPass/MPPasswordCreatorViewController.h +++ b/MacPass/MPPasswordCreatorViewController.h @@ -10,6 +10,6 @@ @interface MPPasswordCreatorViewController : MPViewController -@property (retain, readonly) NSString *generatedPassword; +@property (strong, readonly) NSString *generatedPassword; @end diff --git a/MacPass/MPPasswordCreatorViewController.m b/MacPass/MPPasswordCreatorViewController.m index 4044d536..81fd8205 100644 --- a/MacPass/MPPasswordCreatorViewController.m +++ b/MacPass/MPPasswordCreatorViewController.m @@ -17,19 +17,19 @@ @interface MPPasswordCreatorViewController () { MPPasswordCharacterFlags _characterFlags; } -@property (retain) NSString *password; -@property (retain) NSString *generatedPassword; +@property (strong) NSString *password; +@property (strong) NSString *generatedPassword; -@property (assign) IBOutlet NSTextField *passwordTextField; -@property (assign) IBOutlet NSTextField *passwordLengthTextField; -@property (assign) IBOutlet NSTextField *customCharactersTextField; -@property (assign) IBOutlet NSSlider *passwordLengthSlider; -@property (assign) IBOutlet NSButton *addPasswordToPasteboardButton; -@property (assign) IBOutlet NSButton *upperCaseButton; -@property (assign) IBOutlet NSButton *lowerCaseButton; -@property (assign) IBOutlet NSButton *numbersButton; -@property (assign) IBOutlet NSButton *symbolsButton; -@property (assign) IBOutlet NSButton *customButton; +@property (weak) IBOutlet NSTextField *passwordTextField; +@property (weak) IBOutlet NSTextField *passwordLengthTextField; +@property (weak) IBOutlet NSTextField *customCharactersTextField; +@property (weak) IBOutlet NSSlider *passwordLengthSlider; +@property (weak) IBOutlet NSButton *addPasswordToPasteboardButton; +@property (weak) IBOutlet NSButton *upperCaseButton; +@property (weak) IBOutlet NSButton *lowerCaseButton; +@property (weak) IBOutlet NSButton *numbersButton; +@property (weak) IBOutlet NSButton *symbolsButton; +@property (weak) IBOutlet NSButton *customButton; @property (assign, nonatomic) BOOL useCustomString; @property (assign, nonatomic) NSUInteger passwordLength; @@ -54,11 +54,6 @@ return self; } -- (void)dealloc { - [_generatedPassword release]; - [_password release]; - [super dealloc]; -} - (void)didLoadView { [self.passwordLengthSlider setMinValue:MIN_PASSWORD_LENGTH]; diff --git a/MacPass/MPPasswordEditViewController.m b/MacPass/MPPasswordEditViewController.m index 47a2dc3c..f3ccbba8 100644 --- a/MacPass/MPPasswordEditViewController.m +++ b/MacPass/MPPasswordEditViewController.m @@ -12,9 +12,9 @@ #import "MPDocument.h" @interface MPPasswordEditViewController () -@property (assign) IBOutlet NSSecureTextField *passwordTextField; -@property (assign) IBOutlet NSPathControl *keyfilePathControl; -@property (retain) MPKeyfilePathControlDelegate *pathControlDelegate; +@property (weak) IBOutlet NSSecureTextField *passwordTextField; +@property (weak) IBOutlet NSPathControl *keyfilePathControl; +@property (strong) MPKeyfilePathControlDelegate *pathControlDelegate; - (IBAction)_change:(id)sender; - (IBAction)_cancel:(id)sender; @@ -35,10 +35,6 @@ return self; } -- (void)dealloc { - [_pathControlDelegate release]; - [super dealloc]; -} - (NSResponder *)reconmendedFirstResponder { return self.passwordTextField; diff --git a/MacPass/MPPasswordInputController.m b/MacPass/MPPasswordInputController.m index bc743ad6..21912454 100644 --- a/MacPass/MPPasswordInputController.m +++ b/MacPass/MPPasswordInputController.m @@ -13,11 +13,11 @@ @interface MPPasswordInputController () -@property (assign) IBOutlet NSTextField *passwordTextField; -@property (assign) IBOutlet NSPathControl *keyPathControl; -@property (retain) MPKeyfilePathControlDelegate *pathControlDelegate; -@property (assign) IBOutlet NSImageView *errorImageView; -@property (assign) IBOutlet NSTextField *errorInfoTextField; +@property (weak) IBOutlet NSTextField *passwordTextField; +@property (weak) IBOutlet NSPathControl *keyPathControl; +@property (strong) MPKeyfilePathControlDelegate *pathControlDelegate; +@property (weak) IBOutlet NSImageView *errorImageView; +@property (weak) IBOutlet NSTextField *errorInfoTextField; - (IBAction)_decrypt:(id)sender; @@ -29,10 +29,6 @@ return [[MPPasswordInputController alloc] initWithNibName:@"PasswordInputView" bundle:nil]; } -- (void)dealloc { - [_pathControlDelegate release]; - [super dealloc]; -} - (void)didLoadView { [self.keyPathControl setDelegate:self.pathControlDelegate]; diff --git a/MacPass/MPPasteBoardController.m b/MacPass/MPPasteBoardController.m index 0b7682c3..bbdb4bbd 100644 --- a/MacPass/MPPasteBoardController.m +++ b/MacPass/MPPasteBoardController.m @@ -41,7 +41,6 @@ if(_clearPasteboardOnShutdown) { [[NSNotificationCenter defaultCenter] removeObserver:self]; } - [super dealloc]; } - (void)_updateNotifications { diff --git a/MacPass/MPPopupImageView.m b/MacPass/MPPopupImageView.m index d572595e..315f5033 100644 --- a/MacPass/MPPopupImageView.m +++ b/MacPass/MPPopupImageView.m @@ -76,7 +76,6 @@ // [[NSColor whiteColor] set]; // [triangle fill]; - [shadow release]; [[NSGraphicsContext currentContext] restoreGraphicsState]; } [super drawRect:dirtyRect]; @@ -106,7 +105,6 @@ owner:self userInfo:nil]; [self addTrackingArea:trackingArea]; - [trackingArea release]; } @end diff --git a/MacPass/MPRequestHandlerService.m b/MacPass/MPRequestHandlerService.m index afd8599f..e5c8b3c9 100644 --- a/MacPass/MPRequestHandlerService.m +++ b/MacPass/MPRequestHandlerService.m @@ -29,7 +29,7 @@ NSString *const MPRequestTypeGeneratePassword = @"generate-password"; static NSDictionary *requestHandler; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ - requestHandler = [[self _setupHandlerDictionary] retain]; + requestHandler = [self _setupHandlerDictionary]; }); return requestHandler; } @@ -41,8 +41,6 @@ NSString *const MPRequestTypeGeneratePassword = @"generate-password"; [associateHandler identifier] : associateHandler, [testAssociateHandler identifier] : testAssociateHandler }; - [associateHandler release]; - [testAssociateHandler release]; return handlerDict; } diff --git a/MacPass/MPRootAdapter.h b/MacPass/MPRootAdapter.h index 29514065..56b57c9e 100644 --- a/MacPass/MPRootAdapter.h +++ b/MacPass/MPRootAdapter.h @@ -12,9 +12,9 @@ @interface MPRootAdapter : NSObject -@property (readonly, retain) NSArray *groups; -@property (nonatomic, retain) KdbTree *tree; +@property (readonly, strong) NSArray *groups; +@property (nonatomic, strong) KdbTree *tree; /* Subs to support interface */ -@property (readonly, nonatomic) NSArray *entries; +@property (weak, readonly, nonatomic) NSArray *entries; @end diff --git a/MacPass/MPRootAdapter.m b/MacPass/MPRootAdapter.m index 908cabde..acb6c9f2 100644 --- a/MacPass/MPRootAdapter.m +++ b/MacPass/MPRootAdapter.m @@ -11,21 +11,16 @@ @interface MPRootAdapter () -@property (retain) NSArray *groups; +@property (strong) NSArray *groups; @end @implementation MPRootAdapter -- (void)dealloc { - [_groups release]; - [super dealloc]; -} - (void)setTree:(KdbTree *)tree { if(_tree != tree) { - [_tree release]; - _tree = [tree retain]; + _tree = tree; self.groups = @[_tree.root]; } } diff --git a/MacPass/MPSelectedAttachmentTableCellView.h b/MacPass/MPSelectedAttachmentTableCellView.h index 45576d2a..05e7b91f 100644 --- a/MacPass/MPSelectedAttachmentTableCellView.h +++ b/MacPass/MPSelectedAttachmentTableCellView.h @@ -11,6 +11,6 @@ /* Simple View with an additional Button to add an Action to selected rows */ @interface MPSelectedAttachmentTableCellView : NSTableCellView -@property (nonatomic, assign) IBOutlet NSButton *saveButton; +@property (nonatomic, weak) IBOutlet NSButton *saveButton; @end diff --git a/MacPass/MPServerDaemon.m b/MacPass/MPServerDaemon.m index f0f3eee6..8c6f8604 100644 --- a/MacPass/MPServerDaemon.m +++ b/MacPass/MPServerDaemon.m @@ -38,12 +38,6 @@ return self; } -- (void)dealloc -{ - [statusItem release]; - [server release]; - [super dealloc]; -} - (void)setIsEnabled:(BOOL)enabled { if(_isEnabled == enabled) { @@ -62,7 +56,6 @@ } else { /* Do not let the resource linger around */ - [server release]; server = nil; } [self _updateStatusItem]; @@ -78,7 +71,7 @@ - (void)_updateStatusItem { if(_isEnabled && _showStatusItem) { - statusItem = [[[NSStatusBar systemStatusBar] statusItemWithLength:NSVariableStatusItemLength] retain]; + statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSVariableStatusItemLength]; [statusItem setImage:[MPIconHelper icon:MPIconServer ]]; } else if(statusItem) { diff --git a/MacPass/MPServerSettingsController.h b/MacPass/MPServerSettingsController.h index 85754acb..69f860b9 100644 --- a/MacPass/MPServerSettingsController.h +++ b/MacPass/MPServerSettingsController.h @@ -11,6 +11,6 @@ @interface MPServerSettingsController : MPViewController -@property (assign) IBOutlet NSButton *enableServerCheckbutton; +@property (weak) IBOutlet NSButton *enableServerCheckbutton; @end diff --git a/MacPass/MPSettingsWindowController.m b/MacPass/MPSettingsWindowController.m index 7f1a6838..5cf62b7b 100644 --- a/MacPass/MPSettingsWindowController.m +++ b/MacPass/MPSettingsWindowController.m @@ -14,10 +14,10 @@ NSString *lastIdentifier; } -@property (retain, nonatomic) NSToolbar *toolbar; -@property (retain, nonatomic) NSMutableDictionary *settingsController; -@property (retain, nonatomic) NSMutableDictionary *toolbarItems; -@property (retain) NSArray *defaultToolbarItems; +@property (strong, nonatomic) NSToolbar *toolbar; +@property (strong, nonatomic) NSMutableDictionary *settingsController; +@property (strong, nonatomic) NSMutableDictionary *toolbarItems; +@property (strong) NSArray *defaultToolbarItems; @end @@ -41,13 +41,6 @@ return self; } -- (void)dealloc { - [_settingsController release]; - [_toolbar release]; - [_toolbarItems release]; - [_defaultToolbarItems release]; - [super dealloc]; -} - (void)showSettings { if([self.defaultToolbarItems count] > 0) { @@ -122,8 +115,6 @@ self.defaultToolbarItems = @[ [generalSettingsController identifier], [serverSettingsController identifier] ]; - [generalSettingsController release]; - [serverSettingsController release]; } diff --git a/MacPass/MPShadowBox.m b/MacPass/MPShadowBox.m index 49569164..919c44bc 100644 --- a/MacPass/MPShadowBox.m +++ b/MacPass/MPShadowBox.m @@ -35,7 +35,6 @@ NSColor *bottomColor = [NSColor colorWithCalibratedWhite:0.85 alpha:1]; NSGradient *gradient = [[NSGradient alloc] initWithColors:@[topColor, bottomColor ]]; [gradient drawInRect:dirtyRect angle:-90]; - [gradient release]; NSShadow *dropShadow = [[NSShadow alloc] init]; [dropShadow setShadowColor:[NSColor colorWithCalibratedWhite:0 alpha:0.5]]; @@ -54,7 +53,6 @@ [[NSBezierPath bezierPathWithOvalInRect:bottomElipsis] fill]; } - [dropShadow release]; [[NSGraphicsContext currentContext] restoreGraphicsState]; } diff --git a/MacPass/MPStringLengthValueTransformer.m b/MacPass/MPStringLengthValueTransformer.m index a4292e4c..27b20874 100644 --- a/MacPass/MPStringLengthValueTransformer.m +++ b/MacPass/MPStringLengthValueTransformer.m @@ -25,7 +25,6 @@ NSString *const MPStringLengthValueTransformerName = @"com.hicknhack.macpass.MPM MPStringLengthValueTransformer *transformer = [[MPStringLengthValueTransformer alloc] init]; [NSValueTransformer setValueTransformer:transformer forName:MPStringLengthValueTransformerName]; - [transformer release]; } - (id)transformedValue:(id)value { diff --git a/MacPass/MPToolbarDelegate.h b/MacPass/MPToolbarDelegate.h index 1c810024..ed05b0dc 100644 --- a/MacPass/MPToolbarDelegate.h +++ b/MacPass/MPToolbarDelegate.h @@ -12,6 +12,6 @@ @interface MPToolbarDelegate : NSObject -@property (assign) NSToolbarItem *searchItem; +@property (weak) NSToolbarItem *searchItem; @end diff --git a/MacPass/MPToolbarDelegate.m b/MacPass/MPToolbarDelegate.m index f39bb0cc..7664fe34 100644 --- a/MacPass/MPToolbarDelegate.m +++ b/MacPass/MPToolbarDelegate.m @@ -24,9 +24,9 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR"; @interface MPToolbarDelegate() -@property (retain) NSMutableDictionary *toolbarItems; -@property (retain) NSArray *toolbarIdentifiers; -@property (retain) NSDictionary *toolbarImages; +@property (strong) NSMutableDictionary *toolbarItems; +@property (strong) NSArray *toolbarIdentifiers; +@property (strong) NSDictionary *toolbarImages; - (NSString *)_localizedLabelForToolbarItemIdentifier:(NSString *)identifier; - (SEL)_actionForToolbarItemIdentifier:(NSString *)identifier; @@ -39,20 +39,13 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR"; - (id)init { self = [super init]; if (self) { - _toolbarIdentifiers = [@[ MPToolbarItemAddEntry, MPToolbarItemDelete, MPToolbarItemAddGroup, MPToolbarItemAction, NSToolbarFlexibleSpaceItemIdentifier, MPToolbarItemLock, MPToolbarItemInspector ] retain]; - _toolbarImages = [[self createToolbarImages] retain]; + _toolbarIdentifiers = @[ MPToolbarItemAddEntry, MPToolbarItemDelete, MPToolbarItemAddGroup, MPToolbarItemAction, NSToolbarFlexibleSpaceItemIdentifier, MPToolbarItemLock, MPToolbarItemInspector ]; + _toolbarImages = [self createToolbarImages]; _toolbarItems = [[NSMutableDictionary alloc] initWithCapacity:[self.toolbarIdentifiers count]]; } return self; } -- (void)dealloc -{ - [_toolbarItems release]; - [_toolbarIdentifiers release]; - [_toolbarImages release]; - [super dealloc]; -} - (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag { NSToolbarItem *item = self.toolbarItems[itemIdentifier]; @@ -75,7 +68,6 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR"; NSMenuItem *actionImageItem = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"" action:NULL keyEquivalent:@""]; [actionImageItem setImage:self.toolbarImages[MPToolbarItemAction]]; [menu addItem:actionImageItem]; - [actionImageItem release]; NSArray *menuItems = [MPContextMenuHelper contextMenuItemsWithItems:MPContextMenuExtended]; for(NSMenuItem *item in menuItems) { [menu addItem:item]; @@ -88,10 +80,7 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR"; [popupButton setFrame:newFrame]; [popupButton setMenu:menu]; [item setMenuFormRepresentation:menuRepresentation]; - [menuRepresentation release]; [item setView:popupButton]; - [popupButton release]; - [menu release]; } else { NSButton *button = [[MPToolbarButton alloc] initWithFrame:NSMakeRect(0, 0, 32, 32)]; @@ -114,11 +103,8 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR"; action:[self _actionForToolbarItemIdentifier:itemIdentifier] keyEquivalent:@""]; [item setMenuFormRepresentation:menuRepresentation]; - [menuRepresentation release]; - [button release]; } self.toolbarItems[itemIdentifier] = item; - [item release]; } return item; } diff --git a/MacPass/MPUppercaseStringValueTransformer.m b/MacPass/MPUppercaseStringValueTransformer.m index 9d7beb5b..55c84ca0 100644 --- a/MacPass/MPUppercaseStringValueTransformer.m +++ b/MacPass/MPUppercaseStringValueTransformer.m @@ -24,7 +24,6 @@ NSString *const MPUppsercaseStringValueTransformerName = @"com.hicknhack.macpass MPUppercaseStringValueTransformer *transformer = [[MPUppercaseStringValueTransformer alloc] init]; [NSValueTransformer setValueTransformer:transformer forName:MPUppsercaseStringValueTransformerName]; - [transformer release]; } - (id)transformedValue:(id)value { diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist index 1e8e1a16..1a684aa3 100644 --- a/MacPass/MacPass-Info.plist +++ b/MacPass/MacPass-Info.plist @@ -48,7 +48,7 @@ CFBundleSignature ???? CFBundleVersion - 1846 + 1872 LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright diff --git a/MacPass/NSString+MPPasswordCreation.m b/MacPass/NSString+MPPasswordCreation.m index 8b63e6e6..54e5aa89 100644 --- a/MacPass/NSString+MPPasswordCreation.m +++ b/MacPass/NSString+MPPasswordCreation.m @@ -49,7 +49,7 @@ static NSString *allowedCharactersString(MPPasswordCharacterFlags flags) { while([password length] < length) { [password appendString:[source randomCharacter]]; } - return [password autorelease]; + return password; } + (NSString *)passwordWithCharactersets:(MPPasswordCharacterFlags)allowedCharacters length:(NSUInteger)length {