Adjust to recent ObjFW changes

This commit is contained in:
Jonathan Schleifer 2017-05-08 02:39:06 +02:00
parent 2086b2fa5d
commit a0047e1b54
No known key found for this signature in database
GPG key ID: 28D65178B37F33E3
11 changed files with 38 additions and 37 deletions

View file

@ -24,7 +24,7 @@
@protocol PasswordGenerator @protocol PasswordGenerator
@property size_t length; @property size_t length;
@property (copy) OFString *site; @property (nonatomic, copy) OFString *site;
@property const char *passphrase; @property const char *passphrase;
@property (readonly) unsigned char *output; @property (readonly) unsigned char *output;

View file

@ -23,5 +23,5 @@
@import UIKit; @import UIKit;
@interface AboutController: UIViewController <UIWebViewDelegate> @interface AboutController: UIViewController <UIWebViewDelegate>
@property (retain, nonatomic) IBOutlet UIWebView *webView; @property (nonatomic, retain) IBOutlet UIWebView *webView;
@end @end

View file

@ -25,9 +25,9 @@
#import "MainViewController.h" #import "MainViewController.h"
@interface AddSiteController: UITableViewController @interface AddSiteController: UITableViewController
@property (retain, nonatomic) IBOutlet UITextField *nameField; @property (nonatomic, retain) IBOutlet UITextField *nameField;
@property (retain, nonatomic) IBOutlet UITextField *lengthField; @property (nonatomic, retain) IBOutlet UITextField *lengthField;
@property (retain, nonatomic) IBOutlet UISwitch *legacySwitch; @property (nonatomic, retain) IBOutlet UISwitch *legacySwitch;
@property (retain) MainViewController *mainViewController; @property (retain) MainViewController *mainViewController;
- (IBAction)done: (id)sender; - (IBAction)done: (id)sender;

View file

@ -23,5 +23,5 @@
@import UIKit; @import UIKit;
@interface AppDelegate: UIResponder <UIApplicationDelegate> @interface AppDelegate: UIResponder <UIApplicationDelegate>
@property (strong, nonatomic) UIWindow *window; @property (nonatomic, strong) UIWindow *window;
@end @end

View file

@ -27,5 +27,5 @@
@interface MainViewController: UIViewController <UITableViewDelegate, @interface MainViewController: UIViewController <UITableViewDelegate,
UITableViewDataSource> UITableViewDataSource>
@property (retain) SiteStorage *siteStorage; @property (retain) SiteStorage *siteStorage;
@property (retain, nonatomic) IBOutlet UITableView *tableView; @property (nonatomic, retain) IBOutlet UITableView *tableView;
@end @end

View file

@ -30,7 +30,8 @@
OFArray *_sites; OFArray *_sites;
} }
- (OFArray*)sites; @property (readonly, nonatomic) OFArray<OFString *> *sites;
- (size_t)sitesCount; - (size_t)sitesCount;
- (bool)hasSite: (OFString *)name; - (bool)hasSite: (OFString *)name;
- (size_t)lengthForSite: (OFString *)name; - (size_t)lengthForSite: (OFString *)name;

View file

@ -84,7 +84,7 @@ static OFNumber *lengthField, *legacyField;
[super dealloc]; [super dealloc];
} }
- (OFArray*)sites - (OFArray<OFString *> *)sites
{ {
void *pool = objc_autoreleasePoolPush(); void *pool = objc_autoreleasePoolPush();
OFArray *sites = [[_storage allKeys] sortedArray]; OFArray *sites = [[_storage allKeys] sortedArray];

View file

@ -362,7 +362,7 @@
); );
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "zone.heap.scrypt-pwgen"; PRODUCT_BUNDLE_IDENTIFIER = "zone.heap.scrypt-pwgen.ios";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Debug; name = Debug;
@ -380,7 +380,7 @@
); );
INFOPLIST_FILE = Info.plist; INFOPLIST_FILE = Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "zone.heap.scrypt-pwgen"; PRODUCT_BUNDLE_IDENTIFIER = "zone.heap.scrypt-pwgen.ios";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
}; };
name = Release; name = Release;