Skip to content
This repository has been archived by the owner on Dec 12, 2020. It is now read-only.

resolve deprecation and other warnings per Xcode 8 and 9, update the Pickers library to the currently-supported version #253

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Classes/ByTextFilter.m
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

#import "ByTextFIlter.h"
#import "ByTextFilter.h"
#import "Task.h"

@implementation ByTextFilter
Expand Down
2 changes: 1 addition & 1 deletion Classes/DropboxRemoteClient.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#import <Foundation/Foundation.h>
#import "RemoteClient.h"
#import <DropboxSDK/DropboxSDK.h>
#import "DropboxFIleDownloader.h"
#import "DropboxFileDownloader.h"
#import "DropboxFileUploader.h"

@interface DropboxRemoteClient : NSObject<RemoteClient>
Expand Down
4 changes: 2 additions & 2 deletions Classes/RelativeDate.m
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ + (NSString*)stringWithDate:(NSDate*)date fromDate:(NSDate*)fromDate withFormat:

+ (NSString*)stringWithDate:(NSDate*)date withFormat:(NSString*)format {
NSDate* today = [NSDate date];
NSCalendar *cal = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
NSDateComponents * comp = [cal components:( NSYearCalendarUnit| NSMonthCalendarUnit | NSDayCalendarUnit) fromDate:today];
NSCalendar *cal = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
NSDateComponents * comp = [cal components:( NSCalendarUnitYear| NSCalendarUnitMonth | NSCalendarUnitDay) fromDate:today];
today = [cal dateFromComponents:comp];

return [RelativeDate stringWithDate:date fromDate:today withFormat:format];
Expand Down
2 changes: 2 additions & 0 deletions Classes/Task.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@
- (NSComparisonResult) compareByIdDescending:(Task*)other;
- (NSComparisonResult) compareByPriority:(Task*)other;
- (NSComparisonResult) compareByTextAscending:(Task*)other;
- (NSComparisonResult) compareByDateAscending:(Task*)other;
- (NSComparisonResult) compareByDateDescending:(Task*)other;
- (NSArray *)rangesOfContexts:(NSString *)taskText;
- (NSArray *)rangesOfProjects:(NSString *)taskText;

Expand Down
2 changes: 1 addition & 1 deletion Classes/TaskBagImpl.m
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ - (NSArray*) tasksWithFilter:(id<Filter>)filter withSortOrder:(Sort*)sortOrder {
return localTasks;
}

- (int) size {
- (NSUInteger) size {
return [self.tasks count];
}

Expand Down
11 changes: 7 additions & 4 deletions Libraries/DDFileReader/DDFileReader.m
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,12 @@ - (id) initWithFilePath:(NSString *)aPath {

- (void) dealloc {
[fileHandle closeFile];
[fileHandle release], fileHandle = nil;
[filePath release], filePath = nil;
[lineDelimiter release], lineDelimiter = nil;
[fileHandle release];
fileHandle = nil;
[filePath release];
filePath = nil;
[lineDelimiter release];
lineDelimiter = nil;
currentOffset = 0ULL;
[super dealloc];
}
Expand Down Expand Up @@ -117,4 +120,4 @@ - (void) enumerateLinesUsingBlock:(void(^)(NSString*, BOOL*))block {
}
#endif

@end
@end
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
}

- (void)awakeFromNib {
[super awakeFromNib];

// If set to YES, will display credits for InAppSettingsKit creators
_showCreditsFooter = NO;

Expand Down Expand Up @@ -207,12 +209,18 @@ - (void)navigationController:(UINavigationController *)navigationController will
- (void)dealloc {
[[NSNotificationCenter defaultCenter] removeObserver:self];

[_viewList release], _viewList = nil;
[_currentIndexPath release], _currentIndexPath = nil;
[_file release], _file = nil;
[_currentFirstResponder release], _currentFirstResponder = nil;
[_settingsReader release], _settingsReader = nil;
[_settingsStore release], _settingsStore = nil;
[_viewList release];
_viewList = nil;
[_currentIndexPath release];
_currentIndexPath = nil;
[_file release];
_file = nil;
[_currentFirstResponder release];
_currentFirstResponder = nil;
[_settingsReader release];
_settingsReader = nil;
[_settingsStore release];
_settingsStore = nil;

_delegate = nil;

Expand Down Expand Up @@ -319,10 +327,11 @@ - (CGFloat)tableView:(UITableView*)tableView heightForHeaderInSection:(NSInteger
}
NSString *title;
if ((title = [self tableView:tableView titleForHeaderInSection:section])) {
CGSize size = [title sizeWithFont:[UIFont boldSystemFontOfSize:[UIFont labelFontSize]]
constrainedToSize:CGSizeMake(tableView.frame.size.width - 2*kIASKHorizontalPaddingGroupTitles, INFINITY)
lineBreakMode:NSLineBreakByWordWrapping];
return size.height+kIASKVerticalPaddingGroupTitles;
CGRect rect = [title boundingRectWithSize:CGSizeMake(tableView.frame.size.width - 2*kIASKHorizontalPaddingGroupTitles, INFINITY)
options:NSStringDrawingUsesLineFragmentOrigin
attributes:@{NSFontAttributeName:[UIFont boldSystemFontOfSize:[UIFont labelFontSize]] }
context:nil];
return rect.size.height+kIASKVerticalPaddingGroupTitles;
}
return 0;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,10 @@ - (id)initWithFile:(NSString*)urlString key:(NSString*)key {


- (void)dealloc {
[webView release], webView = nil;
[url release], url = nil;
[webView release];
webView = nil;
[url release];
url = nil;

[super dealloc];
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,16 @@ - (void)viewDidUnload {


- (void)dealloc {
[_currentSpecifier release], _currentSpecifier = nil;
[_checkedItem release], _checkedItem = nil;
[_settingsReader release], _settingsReader = nil;
[_settingsStore release], _settingsStore = nil;
[_tableView release], _tableView = nil;
[_currentSpecifier release];
_currentSpecifier = nil;
[_checkedItem release];
_checkedItem = nil;
[_settingsReader release];
_settingsReader = nil;
[_settingsStore release];
_settingsStore = nil;
[_tableView release];
_tableView = nil;
[super dealloc];
}

Expand Down
18 changes: 12 additions & 6 deletions Libraries/InAppSettingsKit/Models/IASKSettingsReader.m
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,18 @@ - (id)initWithFile:(NSString*)file {
}

- (void)dealloc {
[_path release], _path = nil;
[_localizationTable release], _localizationTable = nil;
[_bundlePath release], _bundlePath = nil;
[_settingsBundle release], _settingsBundle = nil;
[_dataSource release], _dataSource = nil;
[_bundle release], _bundle = nil;
[_path release];
_path = nil;
[_localizationTable release];
_localizationTable = nil;
[_bundlePath release];
_bundlePath = nil;
[_settingsBundle release];
_settingsBundle = nil;
[_dataSource release];
_dataSource = nil;
[_bundle release];
_bundle = nil;

[super dealloc];
}
Expand Down
6 changes: 4 additions & 2 deletions Libraries/InAppSettingsKit/Models/IASKSettingsStoreFile.m
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@ - (id)initWithPath:(NSString*)path {
}

- (void)dealloc {
[_dict release], _dict = nil;
[_filePath release], _filePath = nil;
[_dict release];
_dict = nil;
[_filePath release];
_filePath = nil;

[super dealloc];
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ - (double)doubleForKey:(NSString*)key {
}

- (int)integerForKey:(NSString*)key {
return [[NSUserDefaults standardUserDefaults] integerForKey:key];
return (int)[[NSUserDefaults standardUserDefaults] integerForKey:key];
}

- (id)objectForKey:(NSString*)key {
Expand Down
6 changes: 4 additions & 2 deletions Libraries/InAppSettingsKit/Models/IASKSpecifier.m
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@ - (id)initWithSpecifier:(NSDictionary*)specifier {
}

- (void)dealloc {
[_specifierDict release], _specifierDict = nil;
[_multipleValuesDict release], _multipleValuesDict = nil;
[_specifierDict release];
_specifierDict = nil;
[_multipleValuesDict release];
_multipleValuesDict = nil;

_settingsReader = nil;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ - (void)dealloc {
}

- (void)prepareForReuse {
[super prepareForReuse];

_minImage.image = nil;
_maxImage.image = nil;
}
Expand Down
3 changes: 2 additions & 1 deletion Libraries/InAppSettingsKit/Views/IASKSlider.m
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ @implementation IASKSlider
@synthesize key=_key;

- (void)dealloc {
[_key release], _key = nil;
[_key release];
_key = nil;

[super dealloc];
}
Expand Down
3 changes: 2 additions & 1 deletion Libraries/InAppSettingsKit/Views/IASKSwitch.m
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ @implementation IASKSwitch
@synthesize key=_key;

- (void)dealloc {
[_key release], _key = nil;
[_key release];
_key = nil;

[super dealloc];
}
Expand Down
3 changes: 2 additions & 1 deletion Libraries/InAppSettingsKit/Views/IASKTextField.m
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ @implementation IASKTextField
@synthesize key=_key;

- (void)dealloc {
[_key release], _key = nil;
[_key release];
_key = nil;

[super dealloc];
}
Expand Down
Loading